Merge branch 'backport-4063' into release-2.0.x #2589

Job	Run time
Build	6m 38s
test-broker	28m 3s
test-connection	14m 36s
test-datastore	15m 29s
test-brokerAcl	17m 37s
test-device	5m 18s
test-device-management	13m 15s
test-tag	2m 55s
test-jobsAndScheduler	3m 11s
test-jobsIntegration	10m 3s
test-jobsIntegrationBase	10m 14s
test-security	5m 40s
test-user	4m 0s
test-userIntegration	8m 35s
test-userIntegrationBase	8m 36s
build-javadoc	10m 24s
junit-tests	8m 29s
test-accountAndTranslator	6m 23s
test-api-auth	6m 38s
test-deviceRegistry	12m 46s
test-endpoint	8m 18s
test-jobEngineRestartOfflineDevice	10m 18s
test-jobEngineRestartOnlineDeviceSecondPart	12m 20s
test-jobEngineRestartOnlineDevice	11m 59s
test-jobEngineServiceStop	12m 23s
test-jobEngineStartOfflineDevice	11m 19s
test-jobEngineStartOnlineDevice	13m 21s
test-jobEngineStepDefinitions	8m 21s
test-RoleAndGroup	3m 4s
test-api-corsfilter	6m 52s
	4h 57m 5s

Provide feedback