Fixes to the 0.2.1 collect script after testing
Fixes to the 0.2.1 collect script after testing

mark-in/securedrop-prov-upstream,mark-in/securedrop-prov-upstream,mark-in/securedrop-prov-upstream,mark-in/securedrop-prov-upstream