[BUG #7667] introduce DefaultOrderedDict and OrderedDict to preserve the insertion order (reapply commit)
[BUG #7667] refine due to issues regarding includeNoDeps