Merge commit '92aa5a51e95d74604a40318558aa98f70fcf7720'.

A bunch of painlessly merged commits.

Conflicts:
	manifests/init.pp

diff --cc manifests/init.pp
index 54b4fe4d30366e5263388d37c239ce61cc70cb48,140d2a60ff0bb948d00945d6ce1fcdcf243cd64e..c48cb6e889de9c041400b387554f82a71f03f61e
--- 1/manifests/init.pp
--- 2/manifests/init.pp
+++ b/manifests/init.pp
@@@ -108,23 -54,13 +110,24 @@@ class apt 
      }
    }
  
-   if $apt_unattended_upgrades {
-     include apt::unattended_upgrades
-   }
- 
-   # watch apt.conf.d
 +  # backward compatibility: upgrade from previous versions of this module.
 +  file {
 +    ["/etc/apt/apt.conf.d/from_puppet",
 +     "/etc/apt/apt.conf.d/99from_puppet"
 +    ]:
 +      ensure  => 'absent',
 +      require => [ Apt_conf_snippet['02show_upgraded'],
 +                   Apt_conf_snippet['03clean'],
 +                 ],
 +  }
 +
+   # watch .d directories and ensure they are present
    file { "/etc/apt/apt.conf.d": ensure => directory, checksum => mtime; }
+   file { "/etc/apt/sources.list.d":
+     ensure => directory,
+     checksum => mtime,
+     notify => Exec['refresh_apt'],
+   }
  
    exec {
      # "&& sleep 1" is workaround for older(?) clients