Merge "Fix checkstyle warnings in config-util"