Fix how python 2.6 doesn't have assertDictEqual

Change-Id: I2e3a3dcc173bb5eae0b3e19f1c0eadc496a17e73
Merge "Fix how python 2.6 doesn't have assertDictEqual"