Merge "Fix thread safety issues in netconf client"