Merge branch 'master' into vxlan
Merge branch 'vxlan' of file:///var/repos/verio-cloudstack into vxlan
Add handling of broadcast URI change
Merge remote-tracking branch 'verio-cloudstack/vxlan' into vxlan