Changed --user to --user_id and --role to --role_id in the keystone client for consistency. Need to update keystone calls here.

This change should be applied after [bug/994744 b7fe11c] in python-keystoneclient.

Fixes bug 994744.

stable/essex note: keystoneclient trunk is used by stable/essex devstack
because there aren't stable branches for client libraries so we need
this change to pass devstack gate, currently failing with:
keystone user-role-add: error: ambiguous option: --user could match
--user-id, --user_id

Change-Id: I13e643f8552d86ed0bf92799271899f777bde9b2
Fix bug 1020513 by downloading xenapi plugins from correct place

Cherry picked from:
https://review.openstack.org/#/c/9263/

Change-Id: I2fc9c55b444bac355347f0d53b5971d4b809fbff
Fix multiple distro dependency bug

get_packages() icorrectly handled multiple distros listed in a dependency
file, such as:

    xyz  # dist:fred,barney,wilma

Change-Id: Ib1178b2aaaddafe581902b32776180bb0b41f1ae
(cherry picked from commit 3ea11129012b9ffdf5f38724e11fa9efda9362f5)
Add flag for availablility of change password API.

Change-Id: Ic63754050ef4a5838144edd1d24a2e9206cc0fa5
add TENANT_ARG to swift command line.

Fix bug 1020985.

Cherry-picked from https://review.openstack.org/#/c/9318/

Change-Id: Ibef5b975bdf95250a069797594d010eeb102ecae