Merge "Fix channel masks in LVM tests"