Port access control to new framework
Avoid TypeError when loading local conf override
Service Catalogs
Merge pull request #739 from sshveta/servicecatalogs2

Service Catalogs
Merge pull request #738 from psav/akarol-accesscontrol

Port access control to new framework