Merge "add heat-api-cfn to endpoint map"