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.
ATTS-66: Somewhat messy workarounds to support Apigee endpoints listed in catalog for adminURL and publicURL.
Merge pull request #3 from craiganderson/stable/havana

Implementation of ATTS-66 to update service catalog with Apigee endpoint...