Merge "Fix checkstyle warnings in opendaylight/config"