Switch back to egg version and remove unneeded conditions
Switch back to egg version and remove unneeded conditions

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