Fix include only enabled endpoints in catalog

The server was returning disabled endpoints in the catalog for a
token response. The server should not return disabled endpoints
in the catalog.

Change-Id: Ibaa54eb827846a613fe8c9eced6ae79a8abbfff2
Partial-Bug: #1273867
Merge "Fix include only enabled endpoints in catalog"