Minor checkstyle cleanup in the util package
Merge pull request #2181 from pveentjer/checkstyle-util

Minor checkstyle cleanup in the util package