Bug 5202: merge authorities from the authority file and reservoir