fixes to stash where clauses & backport 4.3 empty field fix
changes to where override from ptp versionrecovery

Conflicts:
	CRM/Extendedreport/Form/Report/Contribute/ContributionAggregates.php
	CRM/Extendedreport/Form/Report/Contribute/Renewals.php