167151b211
* switch from using cfg to using featuremgmt for checking a feature toggle in AC code * merge test fixes
* switch from using cfg to using featuremgmt for checking a feature toggle in AC code * merge test fixes