McConnell gives boost to electoral bill, putting him at odds with Trump