Build box versioned container cleanup regex restoration.
Improved/corrected ZFS volume maintenance to always behave regardless of whether being run on a build box or a container node host.
Merge branch 'master' into jay/lxc-state-monitor