Keystone client commands and options have been normalized and keystone_data.sh needs to support both versions for a transition period. The merge prop for the updated keystone client is https://review.openstack.org/4375 Necessary for bug 396422 Also fix an intermittent problem extacting IDs from command output. Change-Id: Ib13445a0bd3029fb02b0b7a86e8e0b8278717b57