Don't assume the cli driver is in the cli and also close the ssh connection
Merge branch 'ONOS-Next' of https://github.com/OPENNETWORKINGLAB/ONLabTest into ONOS-Next