Scott Dodson 629e4d771b Merge pull request #6860 from jpeeler/aggregate-name-change %!s(int64=7) %!d(string=hai) anos
..
api_server.j2 4fca5efde8 Bug 1524805- ServiceCatalog now works disconnected %!s(int64=7) %!d(string=hai) anos
api_server_route.j2 e2d0ebb3bf Creation of service_catalog and placeholder broker roles %!s(int64=8) %!d(string=hai) anos
controller_manager.j2 4fca5efde8 Bug 1524805- ServiceCatalog now works disconnected %!s(int64=7) %!d(string=hai) anos