Fix conflicts with shell args for subcommands
Fix conflicts with shell args for subcommands

Change-Id: I48517f6b8e25268a00532d9e6fd8fed54f5317cd

Mercador/python-keystoneclient,jamielennox/python-keystoneclient,klmitch/python-keystoneclient,Mercador/python-keystoneclient,klmitch/python-keystoneclient,jamielennox/python-keystoneclient,ntt-sic/python-keystoneclient,ging/python-keystoneclient,ntt-sic/python-keystoneclient,metacloud/python-keystoneclient,metacloud/python-keystoneclient,citrix-openstack-build/python-keystoneclient,darren-wang/ksc,ging/python-keystoneclient,magic0704/python-keystoneclient,magic0704/python-keystoneclient,sdpp/python-keystoneclient,sdpp/python-keystoneclient,alexpilotti/python-keystoneclient,dolph/python-keystoneclient,darren-wang/ksc,ntt-sic/python-keystoneclient,citrix-openstack-build/python-keystoneclient,jamielennox/python-keystoneclient,alexpilotti/python-keystoneclient,dolph/python-keystoneclient,citrix-openstack-build/python-keystoneclient