Merge branch 'security-upload-host' of https://github.com/aburch/dsa-puppet