Reverted to default checkstyle rules
minor tidy
merge origin master
Merge remote-tracking branch 'origin/master'