Merge pull request #5361 from akvo/fix/semaphore-ubuntu-image