Merge "Update lib/keystone to add more system users"