CONTRIB-5157 certificate: remove files in certificate_reset_userdata
Merge remote-tracking branch 'upstream/master'