Merge PR #22527 into master

* refs/pull/22527/head:
	test/encoding/types.h: Adjusting src/messages entries
	test/encoding/types.h: Adjusting src/cls entries
	test/encoding/types.h: Adjusting src/rgw entries
	test/encoding/types.h: Adjusting src/rbd_replay entries
	test/encoding/types.h: Adjusting src/mds entries
	test/encoding/types.h: Adjusting src/mon entries
	test/encoding/types.h: Adjusting src/os entries
	test/encoding/types.h: Adjusting src/osd entries
	test/encoding/types.h: Adjusting src/common entries
	test/encoding/types.h: Adjusting src/test/encoding entries
	test/encoding/types.h: Adjusting src/include/ entries

Reviewed-by: Sage Weil <sage@redhat.com>