Merge pull request #4 from ncthis/master

Fixes in carbon user-manager and registry-osgi