Merge branch 'backport-4054' into release-2.0.x #2600

Job	Run time
Build	6m 32s
test-brokerAcl	17m 41s
test-device	6m 4s
test-broker	27m 26s
test-tag	2m 56s
test-connection	14m 33s
test-datastore	16m 13s
test-device-management	12m 0s
test-user	4m 18s
test-accountAndTranslator	6m 25s
test-jobEngineStepDefinitions	9m 25s
test-jobsAndScheduler	2m 59s
test-jobsIntegration	10m 3s
test-jobsIntegrationBase	9m 45s
test-security	5m 45s
test-userIntegration	8m 36s
test-userIntegrationBase	8m 8s
test-jobEngineRestartOfflineDevice	10m 51s
test-jobEngineRestartOnlineDevice	10m 56s
test-jobEngineServiceStop	12m 59s
test-jobEngineRestartOnlineDeviceSecondPart	11m 27s
test-jobEngineStartOfflineDevice	11m 51s
test-jobEngineStartOnlineDevice	13m 51s
test-RoleAndGroup	2m 47s
junit-tests	8m 21s
build-javadoc	10m 34s
test-api-auth	6m 46s
test-deviceRegistry	12m 28s
test-endpoint	8m 12s
test-api-corsfilter	7m 10s
	4h 57m 2s

Provide feedback