Merge "Tempest test for checking unshelve to host"