Merge branch 'backport-4155' into release-2.0.x #3126

Job	Run time
Build	6m 51s
test-broker	27m 11s
test-brokerAcl	17m 16s
test-device	5m 8s
test-tag	2m 32s
test-accountAndTranslator	6m 8s
test-connection	14m 10s
test-datastore	15m 13s
test-device-management	12m 3s
test-jobEngineStartOfflineDevice	10m 51s
test-jobEngineStartOnlineDevice	10m 34s
test-jobEngineStepDefinitions	7m 56s
test-jobsAndScheduler	2m 57s
test-jobsIntegration	10m 43s
test-jobsIntegrationBase	10m 4s
test-security	5m 41s
test-user	4m 5s
test-userIntegration	8m 21s
test-userIntegrationBase	9m 12s
test-deviceRegistry	12m 31s
test-jobEngineRestartOfflineDevice	10m 9s
test-jobEngineRestartOnlineDevice	10m 4s
test-jobEngineRestartOnlineDeviceSecondPart	10m 12s
test-RoleAndGroup	2m 55s
test-jobEngineServiceStop	7m 52s
build-javadoc	10m 7s
test-api-auth	6m 28s
test-endpoint	8m 10s
junit-tests	8m 19s
test-api-parsing	6m 40s
test-api-corsfilter	6m 39s
	4h 47m 2s

Provide feedback