Merge "Move Cinder non-admin tests into unversioned path"