Merge "yardstick-cleanup.sh: try to fix docker rmi failure"