BC-750 #comment use_www and ssl
BC-750 Merge commit 'd0c6200'

Conflicts:
	templates/bippo_commerce54multi.erb
BC-750 Merge branch 'master' of github.com:soluvas/puppet-nginx

Conflicts:
	templates/bippo_commerce54.erb
	templates/bippo_commerce54multi.erb