CHO will now not always select ONOS1 to be master of all switches
Simple script changes
Updated test scripts and drivers; New ONOS test for ARP and reactive flows
Adding all changes since last commit
Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONLabTest

Conflicts:
	TestON/drivers/common/cli/emulator/mininetclidriver.pyc
	TestON/drivers/common/cli/onosclidriver.pyc
	TestON/tests/OnosCHO4nodes/OnosCHO4nodes.py
	TestON/tests/OnosCHO4nodes/OnosCHO4nodes.pyc
	TestON/tests/OnosPerf4nodes/OnosPerf4nodes.py
	TestON/tests/OnosPerf4nodes/OnosPerf4nodes.pyc
	TestON/tests/OnosSanity/OnosSanity.pyc
	TestON/tests/OnosSanity/__init__.pyc
	TestON/tests/OnosSanity4nodes/OnosSanity4nodes.pyc
	TestON/tests/OnosScale4nodes/OnosScale4nodes.pyc