Cleaup logging after upgrade: use non-deprecated annotations, remove un-used logging methods, re-format
Merge pull request #1572 from jbertram/master

Cleaup logging after upgrade: use non-deprecated annotations, remove un-...