[Merged by Bors] - Make re-org strat more cautious and add more config#4151

michaelsproul wants to merge 5 commits intosigp:unstablesigp/lighthouse:unstablefrom

michaelsproul:reorg-cutoffmichaelsproul/lighthouse:reorg-cutoffCopy head branch name to clipboard