Merge "Python3: use six.iteritems() instead of dict.iteritems()"