Fixing #1108 #1102 #1090.
Merge branch 'feature/721-allocations' of github.com:SalesforceFoundation/Cumulus into feature/721-allocations