Merge "Add shelve/unshelve test of nova APIs"