Shutdown averted, with minutes to spare.
I haven't seen media reports as to the exact provenance of the bill, not clear if it was HR3935 (minus the FAA language), or a new bill. Sounds like the house voted first, so that would be imply a new clean-slate bill, leaving HR3935 still on the back burner.
The FAA was also funded, along with most of government, through mid-Nov. That's good, I'm doing some personal travel next week.