This changes flattened /links output to disclose less routing information and slightly increases memory "leak" from server names that do not come back anymore.
+ branches/release-2.1 -> 2.2 base + 3.0 -> branches/cxxconversion + backport some immediate 3.0 functionality for 2.2 + other stuff