opscode/chef — pull request #2652 by tyler-ball (2014-12-16 04:45:13+00:00)
Title: Merging `fix subscribes` to master

Original PR for 12-stable - https://github.com/opscode/chef/pull/2621
Changelog - https://github.com/opscode/chef/pull/2646

Cherry picked all the commits, had to resolve quite a few issues.