Merge pull request #19 from craiganderson/stable/havana

Stable/havana
Implementation of ATTS-66 to update service catalog with Apigee endpoints.  Distinguish between different URL types in service catalog, and instruct openstack services to use internalURL instead of public.