Merge "BUG-692 Fix intermittent failure in NetconfDeviceTest"