Merge "Handle yangtools nitrogen non-standard branch"