Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Enhancement Shaman.