Generic Service Catalogs
Merge pull request #746 from sshveta/genericservicecatalogs

Genericservicecatalogs