[2869] Fix compile due to CMaNGOS [12456]
[2870] Onyxia Improvements. Requires CMaNGOS [12456]

Also add some candy to Onyxia script suggested and prepared by Wilmaa