enable the user of different DB host
update with master (again, for 91)
Merge click-dev2:/etc/chef/chef-cookbooks