Merge "Add test for nova API of VM lock/unlock"