OZP-853 - added preference controller integration tests
Merge branch 'feature/ozp-852-migrate-dataguard-server'
Fixing bug where legacy-prefs wouldn't start due to incorrectly-named and duplicated Private-Package names for legacy-prefs and legacy-rest.
Merge branch 'master' of github.com:ozoneplatform/ozp-owf

Conflicts:
	bundles/server/legacy/rest/pom.xml
OZP-783 PersonController for preferences API
OZP-783 PersonController tests
OZP-783 Legacy Person Controller
OZP-783 Legacy service for getting the list of users
OZP-804 - Code review changes. Fixed bug where logging in as a non-admin user caused the initial config to load.
OZP-852 Migrate Data Guard server
Added legacy REST integration tests for data guard endpoint
OZP-852 Migrate Data Guard server
Fixed a bug with Jackons serialization. Needed to use ObjectMapper from our ObjectMapperService
Merge branch 'master' into feature/ozp-852-migrate-dataguard-server

Conflicts:
	bundles/server/legacy/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml