OZP-16 Controller test updates
OZP-64 Preference Service update, fix for blueprint.xml file