Merge pull request #1 from uberlaggydarwin/cm-12.0

zara: use correct cmhw path
zara: use by-name partitions.
Merge pull request #2 from uberlaggydarwin/cm-11.0

zara: use byname partitions.