Senators negotiate deal on border provisions, Ukraine aid