Removed overrides which are no longer necessary as the logic was moved
to CumulusCI
Merge branch 'feature/1045-ref-cumulusci' of github.com:SalesforceFoundation/Cumulus into feature/1045-ref-cumulusci

Conflicts:
	build.xml