Merge "Force mtime for tar used in container config md5sums"