More WIP import from the opscode-omnibus OC-11669 branch