Merge "Update for fuel10 onos plugin"