Merge branch 'backport-4061' into release-2.0.x #2570

Job	Run time
Build	6m 36s
test-broker	27m 26s
test-tag	2m 45s
test-connection	14m 40s
test-brokerAcl	17m 45s
test-device	5m 19s
test-device-management	13m 46s
test-datastore	15m 45s
test-user	3m 52s
test-jobsAndScheduler	3m 3s
test-jobsIntegration	9m 55s
test-jobsIntegrationBase	10m 14s
test-security	5m 44s
test-userIntegration	10m 22s
test-accountAndTranslator	6m 21s
test-userIntegrationBase	8m 10s
test-jobEngineRestartOfflineDevice	10m 41s
test-jobEngineRestartOnlineDevice	12m 52s
test-jobEngineRestartOnlineDeviceSecondPart	10m 50s
test-jobEngineServiceStop	13m 20s
test-jobEngineStartOfflineDevice	11m 15s
test-jobEngineStartOnlineDevice	13m 29s
test-jobEngineStepDefinitions	8m 24s
test-RoleAndGroup	3m 14s
build-javadoc	10m 29s
junit-tests	8m 24s
test-api-auth	7m 1s
test-deviceRegistry	12m 29s
test-endpoint	8m 13s
test-api-corsfilter	7m 22s
	4h 59m 46s

Provide feedback