Adding filter to subquery to improve selectiveness against payment object with over 100k rows.
Merge pull request #1204 from SalesforceFoundation/feature/756-non-selective-query

Adding filter to subquery to improve selectiveness against payment objec...
Merge pull request #1203 from SalesforceFoundation/feature/721-allocations

Feature/721 allocations
Merge dev into feature/721-allocations