Merge "Issue fixes for Restconf discovery node"