1b0bd0d045
Part of blueprint merge-openstack-auth Change-Id: I5c5aec5899a3ba18f90ab5ca8d381aeea86b7a5e
Part of blueprint merge-openstack-auth Change-Id: I5c5aec5899a3ba18f90ab5ca8d381aeea86b7a5e