Fixes after sync with upstream #17

Job	Run time
lint-unit / yamllint	8s
lint-unit / rspec	1m 8s
lint-unit / check-metadata	3s
lint-unit / cookstyle	42s
lint-unit / markdown-link-check	14s
lint-unit / markdownlint-cli2	5s
integration (centos-7, client-57)	4m 21s
integration (centos-7, client-80)	2m 26s
integration (centos-7, devel-57)	2m 19s
integration (centos-7, devel-80)	2m 3s
integration (centos-7, server-57)	2m 20s
integration (centos-7, server-80)	2m 42s
integration (centos-7, source-57)	6m 10s
integration (centos-7, source-80)	2m 19s
integration (centos-7, replication-57)	2m 42s
integration (centos-7, replication-80)	2m 28s
integration (centos-7, resources-57)	4m 6s
integration (centos-7, resources-80)	2m 27s
integration (rockylinux-8, client-57)	2m 22s
integration (rockylinux-8, client-80)	3m 2s
integration (rockylinux-8, devel-57)	2m 37s
integration (rockylinux-8, devel-80)	2m 34s
integration (rockylinux-8, server-57)	3m 24s
integration (rockylinux-8, server-80)	3m 32s
integration (rockylinux-8, source-57)	2m 45s
integration (rockylinux-8, source-80)	3m 27s
integration (rockylinux-8, replication-57)	3m 15s
integration (rockylinux-8, replication-80)	3m 46s
integration (rockylinux-8, resources-57)	2m 34s
integration (rockylinux-8, resources-80)	3m 36s
	1h 15m 37s

Provide feedback