Merge "BUG-704 Fix failing integration test in netconf-it"