Trigger apache2 logdir mount and fix logdir on Amazon Linux.
Let templates notify the logdir existence test.

Let existence of logdir always be checked.
Add a sleep second before restarting/reloading apache2 to avoid possible timing issues on small instances.
Quote DB name on granting.
set right group on deployed apps

cr https://cr.amazon.com/r/1526530/
Fix php deployment cookbook tests

cr https://cr.amazon.com/r/1536494/
Fix bind_mounts map in opsworks_initial_setup

Make sure that the ephemeral device is used for the bind mounts both
under Amazon Linux and Ubuntu. It was previously only working under
Ubuntu.

cr https://cr.amazon.com/r/1536527/
alternative/fallback install of bundler for more robustness
Fix creation of rc.local on Amazon Linux and add VG activation on device scanning.
expand the yum-lock timeout patch to all instance types
disable yum update-motd plugin
Trigger autofs restart once when OpsWorks map and/or master map changed.
fix and test database.yml generation
Let every file change trigger an autofs restart.
Merge branch 'master-chef-11.4'

Conflicts:
	apache2/recipes/default.rb
	apache2/recipes/service.rb
	deploy/definitions/opsworks_deploy.rb
	deploy/specs/php_spec.rb
	deploy/specs/rails_spec.rb
	ebs/libraries/block_device.rb
	ebs/recipes/raids.rb
	mysql/templates/default/grants.sql.erb
	opsworks_bundler/attributes/bundler.rb
	opsworks_bundler/recipes/default.rb
	opsworks_initial_setup/attributes/default.rb
	opsworks_initial_setup/recipes/autofs.rb
	opsworks_initial_setup/recipes/tweak_chef_yum_dump.rb
	opsworks_initial_setup/recipes/yum_conf.rb
	opsworks_initial_setup/specs/bind_mounts_spec.rb
	rails/templates/default/database.yml.erb
[#00]Fuck you
[#00] YOU!
[#00] WADKJHAKWDJHAWJ
[#00] Salt n' peppa's here