Revert "Update class.smtp.php"

This reverts commit 47b9099e19efcb6ef649571ba0e00d61ae52b6d4.
Revert "Update class.phpmailer.php"

This reverts commit 5fdf4ef11ab0648d02541bde1aa509878664171a.
Merge branch 'master' into search_lucene_simple_required_zend_libs