Merge "Add keystone user-update test"