Update apache-proxy.rb
Update apache-proxy.rb
Update apache-proxy.rb
Update apache-artifactory-vhost.conf.erb
Update apache-proxy.rb
Update apache-proxy.rb
Update apache-artifactory-vhost.conf.erb
Merge remote-tracking branch 'milesburton/master' into integration/milesburton/master

Conflicts:
	recipes/apache-proxy.rb