Merge branch 'master' into leap
fix for the following: warning: Dynamic lookup of $custom_preferences at modules/apt/manifests/preferences_snippet.pp:16 is deprecated. For more information, see http://docs.puppetlabs.com/guides/scope_and_puppet.html. To see the change in behavior, use the --debug flag.
remove unnecessary before dependency on the /etc/apt/preferences file in unattended_upgrades.pp
Make custom_key_dir a class parameter and not a global variable

Conflicts:
	manifests/init.pp
fix default unattended-upgrades config file
using distribution sprecific files again
fix unattended-upgrades dependency cycle
Updating unattended-upgrades squeeze config as oldstable (2)
Changing 'testing' to 'wheezy' on 50unattended-upgrades.wheezy
Regression: lost MailOnlyOnError for unattended-upgrades

Since only wheezy supports it, let's add it back only for wheezy.

Signed-off-by: Gabriel Filion <gabster@lelutin.ca>
Merge branch 'bug/fix_push' into leap

This gets us fixes for the unattended_upgrades in wheezy, as well as the custom_key_dir class parameter replacement of the global variable
Conflicts:
	manifests/unattended_upgrades.pp
remove unnecessary override and accidentally merge issue