master
Address various new PMD issues
Continuation of Reworking Connection to DB to support non-SQL connections