Merge commit '13f415bbb4bce437a2663c4a3c394805f732b7a6' into
puppetlabs-apache-1_3_0

Conflicts:
	.fixtures.yml
Pass vhost SSL setup down from foreman to foreman::config::passenger
Merge branch 'passenger_ssl_conf_1_3_0' into puppetlabs_apache