Merge "Fix checkstyle warnings in config-api"