Merge branch 'backport-4113' into release-2.0.x #2888

Job	Run time
Build	6m 33s
test-brokerAcl	18m 0s
test-broker	26m 50s
test-tag	2m 30s
test-device-management	11m 49s
test-connection	14m 20s
test-datastore	16m 6s
test-device	6m 29s
test-user	4m 16s
test-jobsAndScheduler	3m 6s
test-jobsIntegration	10m 33s
test-jobsIntegrationBase	9m 49s
test-security	5m 38s
test-userIntegration	9m 11s
test-userIntegrationBase	8m 0s
test-jobEngineRestartOfflineDevice	10m 28s
test-accountAndTranslator	6m 18s
test-jobEngineRestartOnlineDevice	10m 29s
test-jobEngineRestartOnlineDeviceSecondPart	9m 54s
test-jobEngineServiceStop	12m 9s
test-jobEngineStartOfflineDevice	11m 22s
test-jobEngineStepDefinitions	8m 13s
test-jobEngineStartOnlineDevice	11m 45s
build-javadoc	10m 42s
junit-tests	8m 24s
test-api-auth	6m 28s
test-deviceRegistry	13m 12s
test-endpoint	8m 14s
test-RoleAndGroup	2m 51s
test-api-corsfilter	6m 54s
	4h 50m 33s

Provide feedback