TRESOR-393 Fix for Unit Tests failing in different Timezone
TRESOR -393 Merge branch 'cloudyle' of https://github.com/Cloudyle/hapi-fhir into cloudyle

Conflicts:
	hapi-fhir-base/src/test/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGeneratorTest.java
	hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java