variable merging: detect if both vars are really dicts when combining/merging dicts
InventoryScript: better syntax checking for json stream
Tweak error language in dict validation
Merge branch 'sergevanginderachter-issue_8704_stacktrace_varmerge' into devel