allow overriding of endpoint types so they don't get clobbered by recreate endpoint
ensure keystone/ec2 are provinding internal_endpoint
Merge pull request #50 from mancdaz/TA403

Merged automatically by jenkins after successful build test