Senate passes border security funding bill after rejecting House version