That's... weird.  This commit disappeared and broke the none cipher again.
Fixing.
Merge branch 'feature/unified_freebsd' of gitserver.ixsystems.com:/git/repos/freenas-build/trueos into feature/unified_freebsd