Merge release branch 4.19 to 4.20

* 4.19:
  VR: fix site-2-site VPN if split connections is enabled (apache#10067)
  UI: fix cannot open 'Edit tags' modal for static routes (apache#10065)

Author: DaanHoogland

systemvm/debian/opt/cloud/bin/configure.py

@@ -1100,7 +1100,7 @@ def configure_ipsec(self, obj):
             file.addeq(" dpddelay=30")
             file.addeq(" dpdtimeout=120")
             file.addeq(" dpdaction=restart")
-        if splitconnections and peerlistarr.count > 1:
+        if splitconnections and len(peerlistarr) > 1:
             logging.debug('Splitting connections for rightsubnets %s' % peerlistarr)
             for peeridx in range(1, len(peerlistarr)):
                 logging.debug('Adding split connection -%d for subnet %s' % (peeridx + 1, peerlistarr[peeridx]))

ui/src/views/network/StaticRoutesTab.vue

@@ -304,7 +304,6 @@ export default {
     },
     openTagsModal (route) {
       this.selectedRule = route
-      this.rulesRef.value.resetFields()
       this.fetchTags(this.selectedRule)
       this.tagsModalVisible = true
     }