Fine tuned checkstyle.xml with Chris.
Merge pull request #1738 from gregrluck/master

Fine tuned checkstyle.xml with Chris.