Reflecting "haxxxx" recent 5.2 changes

flecting "haxxxx" recent 5.2 changes for Restoration Druid.