BS-8090, fix cache issue on scripts, we were not getting scripts storing shell corretly nor getting script correctly
Merge branch 'master' into 'castorBugFixing'
BS-8507, do not throw the disconnect exception when the connector is disconnected because of an execution exception
BS-8507, move test in src test...
BS-1473, make it possible to change hibernate ehcache configuration, ehcache.xml is in bonita.home/server/platform/conf
BS-6849: add headers and javadoc

Signed-off-by: Aurelien Pupier <aurelien.pupier@bonitasoft.com>
BS-8521 : Add unit tests for query searchSProcessSupervisorWithSUserSGroupSRole
Merge branch 'castorBugFixing' into 'master'
Merge branch 'master'

Conflicts:
	bpm/bonita-bpm-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/test/persistence/repository/TestRepository.java
	bpm/bonita-bpm-integration-tests/bonita-query-tests/src/test/resources/testContext.xml