
Also fixes up a bunch of test issues that are now being triggered on py2.6 Change-Id: I28b13ee3e1c47e2eb5266bc72c8f2da31220b99f
Also fixes up a bunch of test issues that are now being triggered on py2.6 Change-Id: I28b13ee3e1c47e2eb5266bc72c8f2da31220b99f