Minor changes for TestON startup compatibility
"Okay"
Merge branch 'ONOS-Next' of https://github.com/OPENNETWORKINGLAB/ONLabTest into ONOS-Next