Merge "Fix test_cache_hard_links when on tmpfs" into feature/zuulv3