Merge "keystone roles are case insensitive"