Merge "Don't replace OS::Neutron::Port on update"