Merge branch 'backport-4120' into release-2.0.x #2907

Job	Run time
Build	6m 34s
test-brokerAcl	17m 40s
test-device	7m 24s
test-broker	26m 57s
test-connection	14m 31s
test-datastore	20m 5s
test-device-management	12m 20s
test-tag	2m 57s
test-accountAndTranslator	6m 46s
test-jobEngineStepDefinitions	8m 28s
test-jobsAndScheduler	3m 11s
test-jobsIntegration	10m 35s
test-jobsIntegrationBase	10m 26s
test-security	6m 29s
test-user	4m 20s
test-userIntegration	11m 28s
test-userIntegrationBase	8m 23s
test-jobEngineRestartOfflineDevice	10m 47s
test-jobEngineRestartOnlineDevice	13m 41s
test-jobEngineRestartOnlineDeviceSecondPart	11m 52s
test-jobEngineStartOfflineDevice	11m 7s
test-jobEngineStartOnlineDevice	12m 49s
build-javadoc	10m 42s
junit-tests	8m 41s
test-api-auth	6m 49s
test-deviceRegistry	13m 19s
test-endpoint	8m 38s
test-jobEngineServiceStop	13m 7s
test-RoleAndGroup	3m 1s
test-api-corsfilter	6m 56s
	5h 10m 3s

Provide feedback