Jdmundrawala/11 stable

Cherry picking https://github.com/opscode/chef/pull/2103 from master