merged with immerda/master

diff --cc manifests/init.pp
Simple merge

diff --cc manifests/unattended_upgrades.pp
index 27942b3ad1fb814278ff99e4525bb371c6703550,9a6c13ba3a945a3a0ea261c034d1f84aff7975d8..e1080a09706db61671770198d4db1462d59174a6
--- 1/manifests/unattended_upgrades.pp
--- 2/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@@ -5,11 -5,11 +5,13 @@@ class apt::unattended_upgrades 
    }
  
    config_file {
 -    "/etc/apt/apt.conf.d/unattended_upgrades":
 -      content => 'APT::Periodic::Update-Package-Lists "1";
 -APT::Periodic::Unattended-Upgrade "1";
 -',
 -      before => Concatenated_file[apt_config],
 -      require => Package['unattended-upgrades'],
 +    "/etc/apt/apt.conf.d/50unattended-upgrades": 
 +    source  => ["puppet:///modules/site-apt/50unattended-upgrades", 
 +              "puppet:///modules/apt/50unattended-upgrades" ], 
++
++    # err: Could not run Puppet configuration client: Could not find dependent Config_file[apt_config] for Config_file[/etc/apt/apt.conf.d/50unattended-upgrades] at /etc/puppet/modules/apt/manifests/unattended_upgrades.pp:14
 +      
-     before => Config_file[apt_config],
++    #before => Config_file[apt_config],
 +    require => Package['unattended-upgrades'],
    }
  }