Prohibit zvol resizing when readonly property is set.
Merge the rest of the medium-conflict files.