Merge PR #19730 into master

* refs/pull/19730/head:
	mds: Using stl min | max, MIN | MAX macros instead

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc src/mds/MDBalancer.cc
Simple merge

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/Server.cc
Simple merge