Update AWS to upstream master.

This adds the functionality needed for the MongoDB cookbook's EBS support. It includes a small fix I've made that needs to go back to upstream as well.

The change will probably require changing the name of the AWS attributes in the `users.kwarter` databag for consistency with what the updated 'aws' and 'mongodb' cookbooks expect, so I'll need to hunt down any roles/cookbooks using our naming scheme.