replace dict.iteritems() with six.iteritems(dict)

All metadata definition code added should ensure that
six.iteritems is used.

Change-Id: Ic93595ffb2a5a8ed7667028d820fac8debd988e6
Closes-Bug: #1370769