Merge "Fix checkstyle violations in openflowjava-util"