Merge "Move Cinder admin tests into unversioned path"