references atheme@charybdis/1de147abc5b145ea3b7c09128ee8d8fb19726ef4
+ branches/release-2.1 -> 2.2 base + 3.0 -> branches/cxxconversion + backport some immediate 3.0 functionality for 2.2 + other stuff