Merge branch 'backport-4162' into release-2.0.x #3186

Job	Run time
Build	6m 24s
test-broker	26m 44s
test-device	5m 5s
test-tag	2m 40s
test-brokerAcl	17m 27s
test-connection	14m 10s
test-datastore	15m 6s
test-device-management	11m 42s
test-jobsAndScheduler	3m 10s
test-jobsIntegrationBase	9m 20s
test-security	5m 52s
test-user	4m 14s
test-userIntegration	8m 44s
test-userIntegrationBase	9m 7s
test-accountAndTranslator	6m 30s
test-deviceRegistry	12m 30s
test-jobEngineRestartOfflineDevice	10m 39s
test-jobEngineRestartOnlineDevice	10m 17s
test-jobEngineRestartOnlineDeviceSecondPart	9m 44s
test-jobEngineServiceStop	7m 52s
test-jobEngineStartOfflineDevice	11m 45s
test-jobEngineStartOnlineDevice	10m 48s
test-jobEngineStepDefinitions	8m 24s
test-jobsIntegration	10m 5s
test-RoleAndGroup	2m 38s
build-javadoc	10m 1s
junit-tests	8m 52s
test-api-auth	6m 21s
test-endpoint	8m 5s
test-api-parsing	6m 31s
test-api-corsfilter	6m 56s
	4h 47m 43s

Provide feedback