Merge "Add custom config XML support for checkstyle" into nyc-dev