vs_port not added when using bridge_uplinks

Given a hiera config like this:
bridge_mappings:
 - 'physnet1:brex'
 - 'physnet2:br-eth4'
bridge_uplinks:
  - 'brex:eth3'
  - 'br-eth4:eth4'

Steps to reproduce:

<email address hidden> /etc/neutron master; # We have two external networks brex and br-eth4
<email address hidden> /etc/neutron master; /usr/bin/ovs-vsctl list-ports brex
eth3
phy-brex
qg-4daea3ae-3a
<email address hidden> /etc/neutron master; /usr/bin/ovs-vsctl list-ports br-eth4
eth4
phy-br-eth4
<email address hidden> /etc/neutron master; # Now I will delete a port from brex and puppet will fix it
<email address hidden> /etc/neutron master; /usr/bin/ovs-vsctl del-port eth3
<email address hidden> /etc/neutron master; puppet agent -t
Info: Retrieving pluginfacts
Info: Retrieving plugin
Info: Loading facts
Info: Caching catalog for network.s2.scloud.switch.ch
Info: Applying configuration version '1480595075'
Notice: /Stage[main]/Neutron::Agents::Ml2::Ovs/Neutron::Plugins::Ovs::Port[brex:eth3]/Vs_port[eth3]/ensure: created
Notice: Finished catalog run in 6.92 seconds
<email address hidden> /etc/neutron master; # Now I will delete a port from br-eth4 and puppet will fail
<email address hidden> /etc/neutron master; puppet agent -t
Info: Retrieving pluginfacts
Info: Retrieving plugin
Info: Loading facts
Info: Caching catalog for network.s2.scloud.switch.ch
Info: Applying configuration version '1480595159'
Error: Execution of '/usr/bin/ovs-vsctl -- --id=@1 create Interface name=eth4 -- set Port eth4 interfaces=@1' returned 1: ovs-vsctl: no row "eth4" in table Port
Error: /Stage[main]/Neutron::Agents::Ml2::Ovs/Neutron::Plugins::Ovs::Port[br-eth4:eth4]/Vs_port[eth4]/interface: change from [] to eth4 failed: Execution of '/usr/bin/ovs-vsctl -- --id=@1 create Interface name=eth4 -- set Port eth4 interfaces=@1' returned 1: ovs-vsctl: no row "eth4" in table Port
Notice: /Stage[main]/Neutron::Agents::Ml2::Ovs/Neutron::Plugins::Ovs::Port[br-eth4:eth4]/Vs_port[eth4]/lacp: lacp changed '' to 'off'
Notice: /Stage[main]/Neutron::Agents::Ml2::Ovs/Service[neutron-ovs-agent-service]: Dependency Vs_port[eth4] has failures: true
Warning: /Stage[main]/Neutron::Agents::Ml2::Ovs/Service[neutron-ovs-agent-service]: Skipping because of failed dependencies
Notice: Finished catalog run in 6.95 seconds
<email address hidden> /etc/neutron master; # To fix it I have to manually readd the port
<email address hidden> /etc/neutron master; /usr/bin/ovs-vsctl add-port br-eth4 eth4
<email address hidden> /etc/neutron master; puppet agent -t
Info: Retrieving pluginfacts
Info: Retrieving plugin
Info: Loading facts
Info: Caching catalog for network.s2.scloud.switch.ch
Info: Applying configuration version '1480595199'
Notice: /Stage[main]/Neutron::Agents::Ml2::Ovs/Neutron::Plugins::Ovs::Port[br-eth4:eth4]/Vs_port[eth4]/lacp: lacp changed '' to 'off'
Notice: Finished catalog run in 6.20 seconds
<email address hidden> /etc/neutron master;