Merge pull request #5972 from sartura/libyang_patch