Fixing problem where some test was passing when run in eclipse but
failing when run at command line - TRUNK-4134
Merge branch 'master' of https://github.com/openmrs/openmrs-core