Merge remote-tracking branch 'shared/master' into leap

Conflicts:
	manifests/debian.pp
add a 'ssl' parameter, so you do not need to include two classes to get ssl
support, you can simply just pass the 'ssl => true'.

this may also help the occasional warning:

warning: Scope(Class[Apache::Ssl]): Could not look up qualified variable
'apache::manage_shorewall'; class apache has not been evaluated at
/srv/leap/puppet/modules/apache/manifests/ssl.pp:10
fix merge conflict resolution mistake
fixed typo that caused 0-default_ssl.conf to always be created.
Merge remote-tracking branch 'leap/master'