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

This reverts commit eea9be94a7893d7d70431c51c2989b5178e964a7.