Incorporate latest grizzly-volumes patch from jdurgin.
Tweak upstream patch as Ubuntu already has part of it in its releases.
Merge branch 'master' of https://github.com/bloomberg/chef-bcpc
Restructure httpd configuration to be more modular.  See UPDATING for notes.