#970, #973.  fixes to Health Check and error handling for large soqls.
Merge pull request #974 from SalesforceFoundation/feature/973-health-check-fixes

#970, #973.  fixes to Health Check and error handling for large soqls.
Merge dev into feature/362-trial-walkthrough