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

diff --cc neutron/agent/common/ovs_lib.py
Simple merge

diff --cc neutron/agent/l3/router_info.py
Simple merge

diff --cc neutron/agent/linux/dhcp.py
Simple merge

diff --cc neutron/db/l3_agentschedulers_db.py
Simple merge

diff --cc neutron/manager.py
Simple merge

diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
Simple merge

diff --cc neutron/wsgi.py
Simple merge