Merge "BUG-1605: Fixup yang-data-api interface"