Merge "Skip the manual cleaning test if software RAID testing is enabled"