Resolved issue where auth was set after disconnect
Resolved merge conflicts from commit a8eda2d
Resolved merge conflicts from commit 83ba3cf
Merge branch 'hotfix/4640'

Close #4640
Add use statements
Merge branch 'hotfix/4643'

Close #4643
Ran php-cs-fixer to resolve coding standard violations
Merge branch 'hotfix/smtp-auth-does-not-reset-at-quit' of https://github.com/mwillbanks/zf2

PR #4690