Merge branch '4.9' into 4.10

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

tools/appliance/definitions/systemvmtemplate/apt_upgrade.sh

@@ -23,7 +23,9 @@ function add_backports() {
   sed -i '/cdrom/d' /etc/apt/sources.list
   sed -i '/deb-src/d' /etc/apt/sources.list
   sed -i '/backports/d' /etc/apt/sources.list
+  sed -i '/security/d' /etc/apt/sources.list
   echo 'deb http://http.debian.net/debian wheezy-backports main' >> /etc/apt/sources.list
+  echo 'deb http://security.debian.org/debian-security wheezy/updates main' >> /etc/apt/sources.list
 }
 
 function apt_upgrade() {
@@ -37,6 +39,7 @@ function apt_upgrade() {
   apt-get autoclean
   apt-get -q -y --force-yes update
   apt-get -q -y --force-yes upgrade
+  apt-get -q -y --force-yes dist-upgrade
 
   df -h
 }