Merge pull request #1 from craiganderson/stable/havana

Stable/havana
Merge pull request #3 from craiganderson/stable/havana

Add Heat and Ceilometer Endpoints to Catalog
Merge pull request #4 from craiganderson/stable/havana

Keystone v3 related commits that were missing
Merge pull request #5 from craiganderson/stable/havana

Add heat to cache dir purge
Merge pull request #6 from craiganderson/stable/havana

attribute name correction
Merge pull request #7 from craiganderson/stable/havana

adding missing cache dirs to clean when updating keystone ssl keys
removing orchestration not avail in stable/havana
Merge pull request #8 from jhtran/stable/havana

removing orchestration not avail in 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.