CONTRIB-4909 Altered the certificate_scan_image_dir function to be more robust
CONTRIB-4892 Fixed the email to others functionality
Merge remote-tracking branch 'upstream/master'