[GH-111] Enable building of provisionerless and provisioner boxes
Merge remote-tracking branch 'upstream/master'