Merge "Move common _delete_volume cleanup method in base compute test class"