Conform to checkstyle; see etc/checkstyle.xml
Merge pull request #1500 from jbertram/checkstyle

Conform to checkstyle; see etc/checkstyle.xml