Updated for 10.1/20141115
Merge branch 'master' of github.com:joyent/freebsd-image-tests