Router and FIP broken in networking-odl full sync

The following call stack adds a flow to table 19:
(TracingBroker) Proxy795dcd60_8c37_41d1_9f1b_538bfc95653f.setupRouterGwMacFlow
(TracingBroker) Proxy795dcd60_8c37_41d1_9f1b_538bfc95653f.setupRouterGwMacFlow
(TracingBroker) org.opendaylight.netvirt.vpnmanager.CentralizedSwitchChangeListener.setupRouterGwFlows
(TracingBroker) org.opendaylight.netvirt.vpnmanager.CentralizedSwitchChangeListener.add
But this flow is not installed because the ext-routers/routers md-sal object does not have a gw mac set because the neutron port was not present at the time the router was written. This is due to the following fix in networking-odl full sync [1].

Setup used is all-in-one devstack, single VM on a single network + router, external network and a floatiingip. Shutdown odl, wipe configuration, disconnect ovs, restart odl.

[1] https://bugs.launchpad.net/networking-odl/+bug/1677912