Unordered dicts and lists causes variable results

The unordered dict and lists causes variable results.  The user
may see different results and tests can fail.  Might as well make
this more consistent.

Change-Id: I7045b40b44cbf3ee0f2ca79c6ea0d279b6d8cfe3
Merge "Unordered dicts and lists causes variable results"