Backport of #6498 to v0.11.x
Rational: You can waste a lot of bandwidth w/o this patch, e.g. if min relay fee is set higher than normal to avoid a flood attack from crashing your node due to OOM; this is a fairly important anti-DoS protection.
The patch set was cherry-picked perfectly w/ no merge issues as the relevant code hasn't changed from v0.11 to v0.12