Added service again after https://github.com/docker/for-linux/issues/219

Martin Weiserequested to merge
dev into develop-the-search-service-max

Please merge the dev and resolve (eventual) conflicts

Merge request reports