TEIID-3011 adding a better check as to when to skip rewrite
TEIID-3010 adding joda dependency
Conflicts:

	test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData.java