Fixes after sync with upstream #19

Job	Run time
lint-unit / markdownlint-cli2	15s
lint-unit / rspec	1m 13s
lint-unit / yamllint	7s
lint-unit / check-metadata	3s
lint-unit / cookstyle	40s
lint-unit / markdown-link-check	19s
integration (centos-7, client-57)	2m 19s
integration (centos-7, client-80)	2m 8s
integration (centos-7, devel-57)	2m 45s
integration (centos-7, devel-80)	1m 57s
integration (centos-7, server-57)	2m 44s
integration (centos-7, server-80)	1m 37s
integration (centos-7, source-57)	2m 50s
integration (centos-7, source-80)	1m 47s
integration (centos-7, replication-57)	3m 8s
integration (centos-7, replication-80)	2m 1s
integration (centos-7, resources-57)	2m 23s
integration (centos-7, resources-80)	13m 27s
integration (rockylinux-8, client-57)	2m 28s
integration (rockylinux-8, client-80)	3m 13s
integration (rockylinux-8, devel-57)	3m 9s
integration (rockylinux-8, devel-80)	2m 46s
integration (rockylinux-8, server-57)	2m 59s
integration (rockylinux-8, server-80)	3m 14s
integration (rockylinux-8, source-57)	2m 48s
integration (rockylinux-8, source-80)	3m 49s
integration (rockylinux-8, replication-57)	2m 55s
integration (rockylinux-8, replication-80)	3m 55s
integration (rockylinux-8, resources-57)	3m 18s
integration (rockylinux-8, resources-80)	3m 41s
	1h 19m 58s

Provide feedback