Fix some aspects of armor absorption.
Merge pull request #4919 from ianestrachan/fix-armor-absorb

Fix some aspects of armor absorption.