Merge pull request #1222 from njam/service-refactoring

Small ServiceManager adjustments
Merge branch 'master' of github.com:cargomedia/CM into service-filesystems