Add site/license args to zip installer
Merge remote-tracking branch 'origin/issue-396' into issue-396