Lawmakers in Deal on Extending Rail Safety Deadline