Redmine#4683: ensure dynamic inputs from data containers work
Merge remote-tracking branch 'tzz/test/redmine4683-inputs-from-json'
Expand DATA_TYPE_CONTAINER in ExpandScalar if variable is a primitive.

Close #4683