Merge pull request #7208
64360f1 Make max tip age an option instead of chainparam (Wladimir J. van der Laan)