CFRCPRAP-134:   changes related to clean RAP related codes and Port Tabris Compatibility to RWT code