Merge branch 'master'

Conflicts:
	bpm/bonita-bpm-integration-tests/bonita-integration-client-tests/src/main/java/org/bonitasoft/engine/connectors/RemoteConnectorExecutionTest.java
	bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/PlatformAPIImpl.java
	bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/resolver/ProcessDependencyResolver.java
	bpm/bonita-core/bonita-process-engine/src/main/java/org/bonitasoft/engine/execution/ProcessExecutorImpl.java
	services/bonita-connector-executor/bonita-connector-executor-api-impl/src/main/java/org/bonitasoft/engine/connector/impl/ConnectorExecutorImpl.java
	services/bonita-expression/bonita-expression-api-impl/src/main/java/org/bonitasoft/engine/expression/impl/GroovyScriptExpressionExecutorCacheStrategy.java
	services/bonita-platform/bonita-platform-api-impl/src/main/java/org/bonitasoft/engine/platform/impl/PlatformServiceImpl.java
	services/bonita-platform/bonita-platform-api-impl/src/test/java/org/bonitasoft/engine/platform/PlatformServiceImplTest.java
	services/bonita-work/bonita-work-impl/src/main/java/org/bonitasoft/engine/work/ExecutorWorkService.java
	services/bonita-work/bonita-work-impl/src/test/java/org/bonitasoft/engine/work/ExecutorWorkServiceTest.java