Merge "BUG-2459: do not convert NetconfMessage"