Reverting service changes

Merged Sascha Herzinger requested to merge tmp into 563-spring-security

Reverting service changes to start clean with the new security model

Merge request reports