Merge "Fix checkstyle api.openflow.md.util" into stable/boron