Tc/ship oc erchef

[Build](http://wilson.ci.chef.co/job/chef-server-12-trigger-ad_hoc/248/downstreambuildview/)