OPNFLWPLUG-1064: Openflow diagstatus: Merge all