Issue #20820 Keep relation naming schema consistent for item->itemsite.
Issue #20820 Need  on non-isNested as well.
Merge pull request #597 from bendiy/20820

20820 Fix some JSON-Schema issues