Merge pull request #502 from lantz/devel/onos.py

onos.py (Mininet custom file) and minor changes to support it