Merge with trunk
Mount up correct filesystem when preserving configs
Preserve ZFS Extra options on volume create error
merge branch with trunk
fix bugs in the freenasldap framework for local user
Preserve user installed kernel modules through upgrades
First pass at doing the right thing when ldap/ad is switched off
fixes to run cachetool at boot and upon service restart
remove a piece of legacy code
