Test

Partial revert of PR #4911 #137

Job	Run time
docker (docker/Dockerfile.revad) / docker	1m 51s
docker (docker/Dockerfile.revad-eos) / docker	41s
docker (docker/Dockerfile.reva) / docker	32s
docker (docker/Dockerfile.revad-eos) / docker	40s
docker (docker/Dockerfile.revad-ceph) / docker	2m 13s
	5m 57s

Provide feedback