Fix onos-json to linc-oe json error and create a simple non-linear topo for test team to test re-routing

Change-Id: I47c5f3279f5592f235aa831c3d4ca433060b3668
2 files changed