Merge "BUG-1958 Fix leafref path in config-yang module."