Merge "BUG 2661 - sonar issues in openflowplugin-api"