Fix configure for buildbots, fix rebase fallout.