Merge branch 'cooperate-with-chef-omnibus-installer' into integrated