Add shortnames to /etc/hosts again.
Merge branch 'master-chef-11.10' into mainline-chef-11.10
Merge branch 'master-chef-11.10' into mainline-chef-11.10

* master-chef-11.10:
  Add create_dirs_before_symlink as app attribute.
  Fix removal of berkshelf cookbooks when manage_berkshelf is false.
  Update list of versions for prebuild berkshelf packages.
  Allow passing --debug to Berkshelf cookbook installation command.
  Include berkshelf's output in the Chef log.
  Remove berkshelf cookbooks before running `berks vendor` again.
  Test whether RAID is considered as clean.
  Add X-Request-Start header to nginx/unicorn Rails app configuration for NewRelic request queueing
  Make the port for Node.js apps configurable and make it available to apps as PORT environment variable.
  Unicorn should run using the user space ruby installation.
  Expose layers and hosts in opsworks.js.
  Fix autofs service resource for Ubuntu 14.04.
Merge branch 'master-chef-11.10' into mainline-chef-11.10

* master-chef-11.10:
  Map local hostname to 127.0.1.1.
  fixed broken check for database adapter in rails/libraries/rails_configuration.rb
  added attribute to deploy cookbook to set a default for :data_source_provider in each application's database section
  changed rails cookbook to map adapter=mysql to adapter=mysql2 if using RDS
  changed rails adapter function to return mysql2 instead of mysql if an RDS mysql instance is passed
  added missing code to pass the java driver class to the webapp_context template when the database is postgresql
  added missing dependency on deploy cookbook to php and opsworks_java cookbooks
  changed default port on app/database info to be set by the deploy cookbook, and fixed adapter field to reflect that it is now mapped in the config JSON
  changed the php, rails and java cookbooks to use an attribute instead of if/else in the template to handle the new port field in the database config
  Changes to rails, PHP and Java to support RDS. Currently only rails supports postgres
Update default nodejs version to 0.10.27

cr https://cr.amazon.com/r/2403198/
fixed non-existent database_info function in rails::configure

cr https://cr.amazon.com/r/2412597/
Revert "Add X-Request-Start header to nginx/unicorn Rails app configuration for NewRelic request queueing" as it's not supported by nginx 1.1.19.

This reverts commit 7fa3d1fe6e2551041ca06e42880b2ff89c956404.
Revert changes for RDS support.
Merge branch 'master-chef-11.10' into mainline-chef-11.10
Support index.html and index.htm as default document

cr https://cr.amazon.com/r/2490522/
Merge branch 'master-chef-11.10' into mainline-chef-11.10
Add bundler configuration.
Add generic ruby environment manager configuration.
Update default patch level for ruby 2.0.0 to p481.
Set default patchlevel for Ruby 1.9.3 to p547.
Use Ganglia OS packages on Ubuntu 14.04 and adapt daemon control.

Use value_for_platform where possible and make check for Ubuntu version more explicit.

Switch from initctl to service for daemon control.
Balance java app servers with HAProxy.

cr https://cr.amazon.com/r/2534733/
Enable Apache 2.4 on Ubuntu 14.04.

Remove attributes for :run_dir and :default_site_config and check for version 2.2 instead of 2.4.
Let the PHP layer work with Apache 2.4 on Ubuntu 14.04 LTS.

Switch to local vars for default site config and check for version 2.2 instead of 2.4.
Let the Rails layer work with Apache 2.4 on Ubuntu 14.04 LTS.

Switch to local vars for default site config and check for version 2.2 instead of 2.4.