This commit moves "versions" functional tests in v2.1 tests which are
under /v3 directory and run those for v2 and v2.1.
There was no tests for v2.1 version so this patch adds
tests for v2.1 version request.
Partially implements blueprint test-collapse-v2-and-v21
Change-Id: Ibd19c5f96679864db4c4c83b8981bac839feafd2