No need to use OrderedDict

- Theres actually no need to use OrderedDict, and not using it adds
  supposrt for older python version not having collections module.

Change-Id: If91ada91519ad329532fbd60cac4cf12682e49f7
Signed-off-by: David Caro <dcaroest@redhat.com>