Updated openstack/openstack
Project: openstack/heat  5b57317e983728f0a36b6524e0fb526332ce42f3
null
Remove use of py3kcompat

Replace usage of py3kcompat.urlutils by six imports. py3kcompat has been
removed from oslo incubator so we should try to sync.

Change-Id: I252ff2b3a5284cee6e09e70a79b7dad550335f41
Updated openstack/openstack
Project: openstack/nova  e3121e643ccfb2175ccbf130a690054665bb64eb
null
Fix Jenkins translation jobs

The jobs nova-propose-translation-update and
nova-upstream-translation-update do not update from
transifex since our po files contain duplicate entries where
obsolete entries duplicate normal entries.

Remove all obsolete entries to fix the jobs.

Change-Id: I7f51922472f12f3a13feb71a6fb344076781d7e9
Closes-Bug: #1299349