Merge pull request #1572 from jbertram/master

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