[PLAT-3019] - Add src/test/resources to test classpath for mvn tests
Merge remote-tracking branch 'origin/develop' into develop