Fix keystone user role idempotency

Change-Id: Ic2cc9331920d7eeaf2fa5b9532035f3c362434bc