Fix the PMD warnings that failed Outreach.
Merge pull request #1411 from chrisvest/fix-pmd-warnings

Fix the PMD warnings that failed Outreach.