Fix default port for identity.internalURL
Fix default port for identity.internalURL

This should be the public_port and not the admin one.

Sync with default_catalog.templates change
commit 773f0f84af282cd3e53650ccbb99284c37677b6a

Change-Id: Ibb81a06607d94648993768c8b2e7161bf57195a1

klmitch/keystone,JioCloud/keystone,roopali8/keystone,JioCloud/keystone,openstack/keystone,dims/keystone,jonnary/keystone,kwss/keystone,citrix-openstack-build/keystone,roopali8/keystone,derekchiang/keystone,ntt-sic/keystone,openstack/keystone,townbull/keystone-dtrust,ilay09/keystone,ntt-sic/keystone,ging/keystone,townbull/keystone-dtrust,idjaw/keystone,nuxeh/keystone,dstanek/keystone,blueboxgroup/keystone,cernops/keystone,rickerc/keystone_audit,rickerc/keystone_audit,cbrucks/Federated_Keystone,maestro-hybrid-cloud/keystone,takeshineshiro/keystone,MaheshIBM/keystone,derekchiang/keystone,jumpstarter-io/keystone,jamielennox/keystone,reeshupatel/demo,dims/keystone,derekchiang/keystone,cbrucks/Federated_Keystone,mahak/keystone,MaheshIBM/keystone,mahak/keystone,vivekdhayaal/keystone,townbull/keystone-dtrust,vivekdhayaal/keystone,promptworks/keystone,dsiddharth/access-keys,mahak/keystone,dstanek/keystone,ajayaa/keystone,kwss/keystone,maestro-hybrid-cloud/keystone,rajalokan/keystone,takeshineshiro/keystone,cloudbau/keystone,cernops/keystone,reeshupatel/demo,promptworks/keystone,rickerc/keystone_audit,ilay09/keystone,openstack/keystone,ntt-sic/keystone,nuxeh/keystone,dsiddharth/access-keys,jumpstarter-io/keystone,rushiagr/keystone,rajalokan/keystone,jonnary/keystone,rushiagr/keystone,vivekdhayaal/keystone,dstanek/keystone,cloudbau/keystone,cbrucks/Federated_Keystone,rushiagr/keystone,dsiddharth/access-keys,idjaw/keystone,klmitch/keystone,rodrigods/keystone,ging/keystone,ajayaa/keystone,rajalokan/keystone,promptworks/keystone,citrix-openstack-build/keystone,rodrigods/keystone,jamielennox/keystone,himanshu-setia/keystone,UTSA-ICS/keystone-kerberos,himanshu-setia/keystone,reeshupatel/demo,blueboxgroup/keystone,nuxeh/keystone,ilay09/keystone,UTSA-ICS/keystone-kerberos,jumpstarter-io/keystone,kwss/keystone,citrix-openstack-build/keystone,cloudbau/keystone