remove conf.d on all platforms
fixed Include statements to properly segregrate 2.2 and 2.4