This patch set eliminates 2 forked cookbook repos & all tests pass