Update to borrowers-force-messaging-defaults.pl

Includes changes from Bug 33204 and Bug 33239

Again, I put it on top of !795 (merged) and !796 (merged) because of the what's new page... Sorry about that.