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