Merge release branch 4.7 to 4.8

* 4.7:
  Improve ordering of fields of VPC router detail tab

Author: swill

ui/scripts/network.js

@@ -5838,15 +5838,36 @@
                                         label: 'label.name'
                                     }
                                 }, {
+                                    state: {
+                                        label: 'label.state'
+                                    },
+                                    hostname: {
+                                        label: 'label.host'
+                                    },
+                                    linklocalip: {
+                                        label: 'label.linklocal.ip'
+                                    },
+                                    isredundantrouter: {
+                                        label: 'label.redundant.router',
+                                        converter: function(booleanValue) {
+                                            if (booleanValue == true) {
+                                                return "Yes";
+                                            }
+                                            return "No";
+                                        }
+                                    },
+                                    redundantstate: {
+                                        label: 'label.redundant.state'
+                                    },
                                     id: {
                                         label: 'label.id'
                                     },
+                                    serviceofferingname: {
+                                        label: 'label.service.offering'
+                                    },
                                     zonename: {
                                         label: 'label.zone'
                                     },
-                                    dns1: {
-                                        label: 'label.dns'
-                                    },
                                     gateway: {
                                         label: 'label.gateway'
                                     },
@@ -5856,26 +5877,8 @@
                                     guestipaddress: {
                                         label: 'label.guest.ip'
                                     },
-                                    linklocalip: {
-                                        label: 'label.linklocal.ip'
-                                    },
-                                    hostname: {
-                                        label: 'label.host'
-                                    },
-                                    state: {
-                                        label: 'label.state'
-                                    },
-                                    serviceofferingname: {
-                                        label: 'label.service.offering'
-                                    },
-                                    isredundantrouter: {
-                                        label: 'label.redundant.router',
-                                        converter: function(booleanValue) {
-                                            if (booleanValue == true) {
-                                                return "Yes";
-                                            }
-                                            return "No";
-                                        }
+                                    dns1: {
+                                        label: 'label.dns'
                                     },
                                     account: {
                                         label: 'label.account'
@@ -5884,6 +5887,7 @@
                                         label: 'label.domain'
                                     }
                                 }],
+
                                 dataProvider: function(args) {
                                     $.ajax({
                                         url: createURL("listRouters&listAll=true&vpcid=" + args.context.vpc[0].id),