CRM-2182: Broken upgrade builds with test exceptions
   - fix unit tests on coverage build
Merge pull request #3397 from laboro/fix/unit-test-falt-on-coverage-build

CRM-2182: Broken upgrade builds with test exceptions
Merge remote-tracking branch 'remotes/dev/master'