Merge branch 'feature/ozp-806-legacy-prefs-api'

Conflicts:
	bundles/client/legacy/src/main/java/org/ozoneplatform/owf/bundles/client/legacy/controllers/jsconfig/ServerConfigController.java
	bundles/client/legacy/src/main/webapp/WEB-INF/jsconfigControllers-servlet.xml
	bundles/server/legacy/prefs/src/main/groovy/org/ozoneplatform/owf/server/legacy/prefs/rest/PersonWidgetDefinitionController.groovy
	bundles/server/legacy/prefs/src/main/groovy/org/ozoneplatform/owf/server/legacy/prefs/rest/exceptionmap/NotFoundExceptionMapper.groovy
	bundles/server/legacy/prefs/src/main/resources/OSGI-INF/blueprint/blueprint.xml
	bundles/server/legacy/services-api/src/main/groovy/org/ozoneplatform/owf/server/legacy/service/api/TranslationService.groovy
	bundles/server/legacy/services-impl/src/main/groovy/org/ozoneplatform/owf/server/legacy/service/impl/LegacyWidgetServiceImpl.groovy
	bundles/server/legacy/services-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
	bundles/server/legacy/services-impl/src/test/groovy/org/ozoneplatform/owf/server/legacy/service/tests/DescribeTranslationServiceImpl.groovy
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf

Conflicts:
	bundles/server/legacy/prefs/src/main/resources/OSGI-INF/blueprint/blueprint.xml
	bundles/server/legacy/services-api/src/main/groovy/org/ozoneplatform/owf/server/legacy/service/api/TranslationService.groovy
	bundles/server/legacy/services-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml