Improve autoupgrade config for wheezy and jessie

roles/common/templates/apt/auto-upgrades.jessie.j2

@@ -10,12 +10,12 @@ Unattended-Upgrade::Mail "root";
 
 // Automatically upgrade packages from these origin patterns
 Unattended-Upgrade::Origins-Pattern {
-            // Archive or Suite based matching:
-            // Note that this will silently match a different release after
-            // migration to the specified archive (e.g. testing becomes the
-            // new stable).
-            "o=Debian,a=stable";
-            "o=Debian,a=stable-updates";
-    //      "o=Debian,a=stable-proposed-updates";
-            "origin=Debian,archive=stable,label=Debian-Security";
+    // Archive or Suite based matching:
+    // Note that this will silently match a different release after
+    // migration to the specified archive (e.g. testing becomes the
+    // new stable).
+    "o=Debian,a=stable";
+    "o=Debian,a=stable-updates";
+//  "o=Debian,a=stable-proposed-updates";
+    "origin=Debian,archive=stable,label=Debian-Security";
 };

roles/common/templates/apt/auto-upgrades.wheezy.j2

@@ -15,8 +15,7 @@ Unattended-Upgrade::Origins-Pattern {
     // migration to the specified archive (e.g. testing becomes the
     // new stable).
     "o=Debian,a=stable";
-//  "o=Debian,a=stable-updates";
-//  "o=Debian,a=proposed-updates";
-//  "origin=Debian,archive=stable,label=Debian-Security";
-//  "origin=Debian,archive=oldstable,label=Debian-Security";
+    "o=Debian,a=stable-updates";
+//  "o=Debian,a=stable-proposed-updates";
+    "origin=Debian,archive=stable,label=Debian-Security";
 };