Merge release branch 4.13 to master

* 4.13:
  network: cleanup dhcp/dns entries while remove a nic from vm (#3721)

Author: DaanHoogland

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -2014,15 +2014,6 @@ public void cleanupNics(final VirtualMachineProfile vm) {
 
         final List<NicVO> nics = _nicDao.listByVmId(vm.getId());
         for (final NicVO nic : nics) {
-            final NetworkVO network = _networksDao.findById(nic.getNetworkId());
-            if (network != null && network.getTrafficType() == TrafficType.Guest) {
-                final String nicIp = Strings.isNullOrEmpty(nic.getIPv4Address()) ? nic.getIPv6Address() : nic.getIPv4Address();
-                if (!Strings.isNullOrEmpty(nicIp)) {
-                    NicProfile nicProfile = new NicProfile(nic.getIPv4Address(), nic.getIPv6Address(), nic.getMacAddress());
-                    nicProfile.setId(nic.getId());
-                    cleanupNicDhcpDnsEntry(network, vm, nicProfile);
-                }
-            }
             removeNic(vm, nic);
         }
     }
@@ -2044,9 +2035,18 @@ protected void removeNic(final VirtualMachineProfile vm, final NicVO nic) {
             }
         }
 
+        final NetworkVO network = _networksDao.findById(nic.getNetworkId());
+        if (network != null && network.getTrafficType() == TrafficType.Guest) {
+            final String nicIp = Strings.isNullOrEmpty(nic.getIPv4Address()) ? nic.getIPv6Address() : nic.getIPv4Address();
+            if (!Strings.isNullOrEmpty(nicIp)) {
+                NicProfile nicProfile = new NicProfile(nic.getIPv4Address(), nic.getIPv6Address(), nic.getMacAddress());
+                nicProfile.setId(nic.getId());
+                cleanupNicDhcpDnsEntry(network, vm, nicProfile);
+            }
+        }
+
         nic.setState(Nic.State.Deallocating);
         _nicDao.update(nic.getId(), nic);
-        final NetworkVO network = _networksDao.findById(nic.getNetworkId());
         final NicProfile profile = new NicProfile(nic, network, null, null, null, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(
                 vm.getHypervisorType(), network));