Merge branch 'backport-4107' into release-2.0.x #2833

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

Provide feedback