Apply previous EatDrinkBandage fix to other classes that need it. Also small fix/tweak to warlock OOC mana regen options.