fixed remaining RD changes post-revert
fixed remaining RD changes post-revert

Zosoled/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus