Add Mavericks conditional and new default conditional for onyx
Merge pull request #7108 from remailednet/onyx

Add Mavericks conditional and new default conditional for onyx