Sqlcoverage rework -- all "product" changes (non-test) are already in the pre-coverage branch pull request. Passes jenkins.