Merge "Add shelve/unshelve volume backed instance test"