Merge "Do not configure system-scope admin for keystone"