Implement and conform to checkstyle; see etc/checkstyle.xml

NOTE: although code changed, there should be NO SEMANTIC CHANGES here
Merge pull request #1512 from jbertram/2.3.x_checkstyle

Implement and conform to checkstyle; see etc/checkstyle.xml