Minor clean up to satify checkstyle rules.
Merge branch 'master' of https://github.com/priimak/checkstyle

Conflicts:
	src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/HiddenFieldCheckTest.java