CRM-2182: Broken upgrade builds with test exceptions
    - fix unit tests on travis
Merge pull request #1345 from laboro/fix/travis_ci_tests

CRM-2182: Broken upgrade builds with test exceptions