Revert "Comment out openstack bats image and volume cleanup for now."

This reverts commit 46462e44542a9ef37dc285ccd3591e71427d47f2.