Merge "Remove testing of bdm v1 in boot from volume tests"