Merge "BUG 6726 : Loss of traffic during ODL Cluster reboot"