Unit tests of reboot and shutdown
Merge branch 'master' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas

ly if it merges an updated upstream into a topic branch.