remove_role_from_user_and_project affecting all users (bug 1170649)

Change-Id: I2333404991114e6985f3f2c4de4fb30dc3195b2d
Merge "remove_role_from_user_and_project affecting all users (bug 1170649)"