Merge branch...

Merge branch '1986-start-of-minerva-service-should-not-be-blocked-by-the-jobs-in-queue' into 'master'

Resolve "start of minerva service should not be blocked by the jobs in queue"

Closes #1986

See merge request !1680