Move cinder tests into unversioned path - part2

As http://lists.openstack.org/pipermail/openstack-dev/2017-March/114507.html
we will use the existing Cinder V2 API tests for testing the base
microversion of Cinder V3 API also.
So it is not necessary to contain versioned path in test module pathes.
This patch moves remaining Cinder non-admin tests to unversioned pathes
by merging tests into the same name test modules.

Change-Id: I212077ea042261d94dbab4826ff18456d600dd06
5 files changed