Merge "Add missing TEMP_FAILURE_RETRYs in dt_fd_forward"