Restore BC with old OHAI constant
Update software definitions to use Ohai instead of OHAI
The omnibus generator creates omnibus-NAME
Run specs in a random order
Clean up the specs a bit