After months of often contentious debate, Congress has approved a major Federal Aviation Administration funding bill.