Seems like some changes were lost when I manually resolved the conflicts related to branch 905-...
Seems like some changes were lost when I manually resolved the conflicts related to branch 905-...

SalesforceFoundation/Cumulus,cyberjus/Cumulus,cdcarter/Cumulus,cdcarter/Cumulus,abeyer/Cumulus,jlantz/Cumulus,jlantz/Cumulus,cyberjus/Cumulus,ehrenfoss/Cumulus,jarkos88/Cumulus1,InspectorSpacetime/Cumulus,cdcarter/Cumulus,Zosoled/Cumulus,InspectorSpacetime/Cumulus,BillFlorioSFDC/Cumulus,Zosoled/Cumulus,InspectorSpacetime/Cumulus,jarkos88/Cumulus1,Zosoled/Cumulus,abeyer/Cumulus,BillFlorioSFDC/Cumulus,cyberjus/Cumulus,abeyer/Cumulus,ehrenfoss/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,jlantz/Cumulus,Zosoled/Cumulus,jlantz/Cumulus,BillFlorioSFDC/Cumulus,jarkos88/Cumulus1,cyberjus/Cumulus,InspectorSpacetime/Cumulus,ehrenfoss/Cumulus,BillFlorioSFDC/Cumulus,abeyer/Cumulus,cdcarter/Cumulus,SalesforceFoundation/Cumulus