OAK-1816 - Oak#createContentRepository never unregisters some of its services

Merging 1605447 


git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1612244 13f79535-47bb-0310-9956-ffa450edef68