Merge "Make local boot explicit on software raid tests"