start moving headers to version-mangled namespaces
finish moving to version-mangled namespace
Reran ./bin/format.sh
Merge branch 'versioning'