Skip checkstyle if the tests are skipped
Add and fix comments
Fix indentation, fix codestyle issues
Merge branch 'master' into search-1.3.x