Fix instances of list(six.iterkeys(d))
Merge pull request #1893 from mdboom/misc/simplify-six

Fix some six changes