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: Additional update to distinguish Apigee neutron endpoints that appear in the service catalog from the particular params that appear in openstack config files
Merge pull request #13 from craiganderson/stable/havana

Implementation of ATTS-66 to update service catalog with Apigee endpoint...
Merge branch 'ccp' into stable/havana

Conflicts:
	metadata.rb
Merge remote-tracking branch 'upstream/stable/havana' into ccp