Remove legacy_endpoint_id and enabled from service catalog

Those two fields are for internal use, and should not be in the token.

The token size was expanding past the threshold where it could
be passed between a wsgi process and Apache HTTPD, even for
a basic, devstack sized catalog.  This reduces the size.

Change-Id: Ic8eb70e519a8a35fd05b497d917f9889e82b6e7f
Closes-Bug: 1302075
Merge "Remove legacy_endpoint_id and enabled from service catalog"