[sr-dev] git:master:25b1f199: tm: removed ifdefs for WITH_XAVP