Lindalu/resolve pr 584 conflicts#586

lindalu-MSFT merged 14 commits into

livemicrosoft/json-schemas:livefrom

lindalu/resolve-pr-584-conflictsmicrosoft/json-schemas:lindalu/resolve-pr-584-conflictsCopy head branch name to clipboard