Merge release branch 4.7 to 4.8

* 4.7:
  Display hostname the VPC router runs on
  CLOUDSTACK-9266: Make deleting static routes in private gw work
  CLOUDSTACK-9264: Make /32 static routes for private gw work

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

@@ -85,13 +85,13 @@ class CsStaticRoutes(CsDataBag):
 
     def __update(self, route):
         if route['revoke']:
-            command = "route del -net %s gw %s" % (route['network'], route['gateway'])
+            command = "ip route del %s via %s" % (route['network'], route['gateway'])
             result = CsHelper.execute(command)
         else:
             command = "ip route show | grep %s | awk '{print $1, $3}'" % route['network']
             result = CsHelper.execute(command)
             if not result:
-                route_command = "route add -net %s gw %s" % (route['network'], route['gateway'])
+                route_command = "ip route add %s via %s" % (route['network'], route['gateway'])
                 result = CsHelper.execute(route_command)
 
 

systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py

@@ -21,13 +21,5 @@ from pprint import pprint
 def merge(dbag, staticroutes):
     for route in staticroutes['routes']:
         key = route['network']
-        revoke = route['revoke']
-        if revoke:
-            try:
-                del dbag[key]
-            except KeyError:
-                pass
-        else:
         dbag[key] = route
-
     return dbag

ui/scripts/network.js

@@ -5859,6 +5859,9 @@
                                     linklocalip: {
                                         label: 'label.linklocal.ip'
                                     },
+                                    hostname: {
+                                        label: 'label.host'
+                                    },
                                     state: {
                                         label: 'label.state'
                                     },