Merge PR #22560 into master

* refs/pull/22560/head:
	qa/fs/upgrade/snaps: whitelist inconsistent rstat
	mds: track snapshot count in rstat
	mds: add MAY_SNAPSHOT in MDSAuthCaps

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

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

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

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

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

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

diff --cc src/mds/mdstypes.h
Simple merge