Remove unused imports and methods
Various fixes and updates
Merge branch 'master' of https://github.com/jenkinsci/email-ext-plugin