Merge "Fixed discard-changes for mdsal netconf, mapping code cleanup."