Merge "Keep Docker builds from thrashing on same server"