Merge branch 'alice' into mad-hatter

* commit '1dfec49f6':
  MB-40531: [BP] Make replica eviction ignore age threshold

Merged using strategy 'ours' given this is a backport of code already
in mad-hatter.

Change-Id: I9934d3dc1d33d7ce93a43bc5160c5e77d6f7d019

Author: daverigby