Address PECAS Java Checkstyle issues. Many still remain. (PECAS-86)
Merge branch 'feature-java-cleanup' into develop