Merge pull request #1585 from scop/checkstyle

Update checkstyle plugin to 2.12
fix
fix