Device Discovery changes
Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONLabTest