Remove v2.0 public_endpoint and admin_endpoint

Erroneously added the keystone version to this endpoint declaration. It
should simply be the fqdn and port.
Merge pull request #506 from craigtracey/keystone-endpoint-2

Remove v2.0 public_endpoint and admin_endpoint