Skip checkstyle if the tests are skipped
Merge branch 'master' into search-1.5.x