Merge pull request #1566 from jbertram/master

HORNETQ-1333 - Spurious WARN messages after XmlDataImporter deletes temp...
Cleaup logging after upgrade: use non-deprecated annotations, remove un-used logging methods, re-format