Update client-env to use openstackclient commands

Updated the only instance of a keystoneclient command, to
check if the identity service is enabled.

Change-Id: If86f71c1610a79690d6c6a8eb423b6fa234372bb
Merge "Update client-env to use openstackclient commands"