#1 Restore checkstyle to original settings

[Brian Freeman]

I recently delivered some changes that required some modifications to configCheckstyle.xml in order for the build to pass. The changes should be replaced with the original and the code should be modified to pass correctly.