Merge branch 'backport-4052' into release-2.0.x #2531

Job	Run time
Build	6m 50s
test-broker	26m 58s
test-device	5m 34s
test-brokerAcl	18m 11s
test-tag	2m 28s
test-connection	14m 45s
test-datastore	15m 55s
test-device-management	12m 44s
test-security	5m 34s
test-user	4m 0s
test-userIntegration	8m 56s
test-userIntegrationBase	8m 6s
test-accountAndTranslator	6m 17s
test-jobEngineRestartOfflineDevice	10m 51s
test-jobEngineRestartOnlineDevice	13m 44s
test-jobEngineStartOfflineDevice	11m 21s
test-jobEngineStartOnlineDevice	13m 38s
test-jobEngineStepDefinitions	8m 45s
test-jobsAndScheduler	2m 56s
test-jobsIntegrationBase	10m 15s
test-jobsIntegration	9m 49s
test-api-auth	6m 45s
test-deviceRegistry	12m 41s
test-endpoint	8m 29s
test-jobEngineRestartOnlineDeviceSecondPart	12m 39s
test-jobEngineServiceStop	12m 52s
test-RoleAndGroup	2m 55s
build-javadoc	10m 21s
junit-tests	8m 23s
test-api-corsfilter	7m 3s
	4h 59m 45s

Provide feedback