Merge release branch 4.8 to 4.9

* 4.8:
  CLOUDSTACK-9746 system-vm: logrotate config causes critical failures

systemvm/patches/debian/config/etc/logrotate.d/apache2

@@ -4,6 +4,6 @@
        rotate 3
        compress
        dateext
-       size 10M
+       maxsize 10M
        notifempty
 }

systemvm/patches/debian/config/etc/logrotate.d/cloud

@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 /var/log/cloud.log {
-        rotate 4
-        size 10M
+        rotate 10
+        maxsize 10M
         missingok
         notifempty
         compress

systemvm/patches/debian/config/etc/logrotate.d/conntrackd

@@ -1,5 +1,5 @@
 /var/log/conntrackd-stats.log {
-    size 10M
+    maxsize 10M
     rotate 2
     missingok
     compress

systemvm/patches/debian/config/etc/logrotate.d/dnsmasq

@@ -1,5 +1,5 @@
 /var/log/dnsmasq.log {
-    size 10M
+    maxsize 10M
     missingok
     rotate 5
     notifempty

systemvm/patches/debian/config/etc/logrotate.d/haproxy

@@ -2,7 +2,7 @@
     rotate 5
     missingok
     notifempty
-    size 10M
+    maxsize 10M
     postrotate
       /bin/kill -HUP `cat /var/run/rsyslog.pid 2> /dev/null` 2> /dev/null || true
     endscript

systemvm/patches/debian/config/etc/logrotate.d/ppp

@@ -1,5 +1,5 @@
 /var/log/ppp-connect-errors {
-	size 10M
+	maxsize 10M
 	rotate 5
 	missingok
 	notifempty

systemvm/patches/debian/config/etc/logrotate.d/rsyslog

@@ -1,10 +1,9 @@
 /var/log/syslog
 {
 	rotate 7
-	size 50M
+	maxsize 10M
 	missingok
 	notifempty
-	delaycompress
 	compress
 	postrotate
 		/usr/sbin/invoke-rc.d rsyslog rotate > /dev/null
@@ -25,11 +24,10 @@
 /var/log/messages
 {
 	rotate 10
-	size 50M
+	maxsize 10M
 	missingok
 	notifempty
 	compress
-	delaycompress
 	sharedscripts
 	postrotate
 		/usr/sbin/invoke-rc.d rsyslog rotate > /dev/null