Expose the service catalog
Merge branch 'expose_service_catalog'