This reverts commit bf13ee5a. Revert only configuration code Conflicts: src/Makefile.am src/configmanager.hh src/flexisip-exception.cc src/module.cc src/presence/Makefile.am src/presence/presence-server.cc src/presence/presence-server.h src/proxy-configmanager.cc