adding node ip option to onos-uninstall
Staging commit for changing branch
Minor changes to driver
fixing merge conflict