Merge remote-tracking branch 'origin/staging3.1.1' into dev

diff --cc addons/address.py
index 7105f5d2ffb120d829533ab1d65b82cb69e486c2,90117bac1e114d9694bf94dd55f465fb688ffb11..8cbe9fd3c5832cd9d541f09662d29bd7757eed48
--- 1/addons/address.py
--- 2/addons/address.py
+++ b/addons/address.py
@@@ -335,32 -335,31 +335,31 @@@ class address(moduleBase)
          try:
              self.ipcmd.batch_commit()
          except Exception as e:
-             self.logger.error('%s: %s' % (ifaceobj.name, str(e)))
-             ifaceobj.set_status(ifaceStatus.ERROR)
+             self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj, raise_error=False)
  
 -        hwaddress = self._get_hwaddress(ifaceobj)
 -        if hwaddress:
 -            running_hwaddress = None
 -            if not ifupdownflags.flags.PERFMODE: # system is clean
 -                running_hwaddress = self.ipcmd.link_get_hwaddress(ifaceobj.name)
 -            if hwaddress != running_hwaddress:
 -                slave_down = False
 -                netlink.link_set_updown(ifaceobj.name, "down")
 -                if ifaceobj.link_kind & ifaceLinkKind.BOND:
 -                    # if bond, down all the slaves
 -                    if ifaceobj.lowerifaces:
 -                        for l in ifaceobj.lowerifaces:
 -                            netlink.link_set_updown(l, "down")
 -                        slave_down = True
 -                try:
 -                    self.ipcmd.link_set(ifaceobj.name, 'address', hwaddress)
 -                finally:
 -                    netlink.link_set_updown(ifaceobj.name, "up")
 -                    if slave_down:
 -                        for l in ifaceobj.lowerifaces:
 -                            netlink.link_set_updown(l, "up")
 -
          try:
 +            hwaddress = self._get_hwaddress(ifaceobj)
 +            if hwaddress:
 +                running_hwaddress = None
 +                if not ifupdownflags.flags.PERFMODE: # system is clean
 +                    running_hwaddress = self.ipcmd.link_get_hwaddress(ifaceobj.name)
 +                if hwaddress != running_hwaddress:
 +                    slave_down = False
 +                    netlink.link_set_updown(ifaceobj.name, "down")
 +                    if ifaceobj.link_kind & ifaceLinkKind.BOND:
 +                        # if bond, down all the slaves
 +                        if ifaceobj.lowerifaces:
 +                            for l in ifaceobj.lowerifaces:
 +                                netlink.link_set_updown(l, "down")
 +                            slave_down = True
 +                    try:
 +                        self.ipcmd.link_set(ifaceobj.name, 'address', hwaddress)
 +                    finally:
 +                        netlink.link_set_updown(ifaceobj.name, "up")
 +                        if slave_down:
 +                            for l in ifaceobj.lowerifaces:
 +                                netlink.link_set_updown(l, "up")
 +
              # Handle special things on a bridge
              self._process_bridge(ifaceobj, True)
          except Exception, e:

diff --cc addons/vrf.py
Simple merge