Support a "federation-upstream" policy, and test it in the max_hops_test.
Merged bug25554 into default