Merge "[APEX-171] Upgrade ONOS into 1.6 and ovs into 2.5.90 for SFC function"