Merge "Fix checkstyle warnings in yang-test-plugin."