Merge remote-tracking branch 'leap/feature/unattended_upgrades' into review

Conflicts:
	files/lenny/50unattended-upgrades

diff --cc manifests/unattended_upgrades.pp
index d2a2352e48814c2f19e70181b57fb629f0b84252,34d4d31bcc8f9a66122e79613225a735060a3007..c538831cb41a6ae8b2b4e88139d70667c4b5a9ef
--- 1/manifests/unattended_upgrades.pp
--- 2/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@@ -5,11 -5,11 +5,12 @@@ class apt::unattended_upgrades 
      require => undef,
    }
  
 -  apt_conf { "50unattended-upgrades":
 -    source  => ["puppet:///modules/site_apt/$lsbdistcodename/50unattended-upgrades",
 -              "puppet:///modules/site_apt/50unattended-upgrades",
 -              "puppet:///modules/apt/$lsbdistcodename/50unattended-upgrades",
 -              "puppet:///modules/apt/50unattended-upgrades" ],
 +  apt_conf { '50unattended-upgrades':
 +    source  => [
 +                "puppet:///modules/site_apt/${::lsbdistcodename}/50unattended-upgrades",
 +                'puppet:///modules/site_apt/50unattended-upgrades',
-                 "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades" ],
++                "puppet:///modules/apt/${::lsbdistcodename}/50unattended-upgrades",
++                'puppet:///modules/apt/50unattended-upgrades' ],
      require => Package['unattended-upgrades'],
    }