Merge branch 'backport-4116' into release-2.0.x #2882

Job	Run time
Build	6m 26s
test-brokerAcl	17m 37s
test-tag	2m 52s
test-device	5m 32s
test-connection	14m 19s
test-device-management	11m 43s
test-datastore	15m 28s
test-user	4m 10s
test-userIntegrationBase	8m 10s
test-accountAndTranslator	6m 24s
test-broker	26m 37s
test-jobsAndScheduler	3m 3s
test-jobsIntegration	9m 47s
test-jobsIntegrationBase	9m 46s
test-security	5m 40s
test-userIntegration	9m 13s
test-jobEngineRestartOfflineDevice	10m 27s
test-jobEngineRestartOnlineDevice	10m 34s
test-jobEngineRestartOnlineDeviceSecondPart	10m 4s
test-jobEngineStartOfflineDevice	10m 55s
test-jobEngineStartOnlineDevice	10m 39s
test-jobEngineStepDefinitions	8m 10s
junit-tests	8m 8s
build-javadoc	10m 15s
test-api-auth	6m 55s
test-deviceRegistry	12m 39s
test-endpoint	8m 8s
test-jobEngineServiceStop	10m 41s
test-RoleAndGroup	2m 51s
test-api-corsfilter	6m 40s
	4h 43m 53s

Provide feedback