Updated openstack/openstack
Project: openstack/nova  c074c741bffe2c2be7adc89f2f1861445474c9b9

Share lock_server unit test between V2 & V2.1

This patch moves lock_server unit test from v3 directory to contrib
and makes it shared by V2 and V21.

PS. lock_server unit test cases was removed from admin actions unit
test case.

Partially implements blueprint v2-on-v3-api

Change-Id: I9cee1ae5075d6e7a7cd7aa05b105e487c239d24a