Add --catalog to service show

Pulls from the service catalog rather than the system services

Change-Id: I842916af9f7c0a76c4d3e27e419bf0fec059ec78
Merge branch '27143-role-fix' into dt-test
Merge branch 'identity-ec2' into dt-test
Merge branch 'identity-catalog' into dt-test