[trivial] Ohai 551 rebase

Rebased against opscode ohai/master to include support for docker-0.9.0-master.