Merge "Set admin_region option correctly for keystone:server"