Update for 12.1-RELEASE#5

jurajlutter wants to merge 2 commits intoTritonDataCenter:masterTritonDataCenter/freebsd-kvm-image-builder:masterfrom

jurajlutter:12.1-releasejurajlutter/freebsd-kvm-image-builder:12.1-releaseCopy head branch name to clipboard