Remove symlink optimization, so helpfiles equal for opers and users are loaded into memory twice, which is not an issue.
+ branches/release-2.1 -> 2.2 base + 3.0 -> branches/cxxconversion + backport some immediate 3.0 functionality for 2.2 + other stuff