Merge branch 'backport-4159' into release-2.0.x #3157

Job	Run time
Build	6m 33s
build-javadoc	10m 11s
junit-tests	8m 23s
test-api-auth	6m 27s
test-accountAndTranslator	6m 17s
test-broker	26m 44s
test-brokerAcl	17m 47s
test-datastore	15m 30s
test-connection	14m 28s
test-device	5m 12s
test-device-management	12m 12s
test-deviceRegistry	12m 12s
test-endpoint	7m 57s
test-jobEngineRestartOfflineDevice	10m 14s
test-jobEngineRestartOnlineDevice	11m 20s
test-jobEngineRestartOnlineDeviceSecondPart	9m 22s
test-jobEngineServiceStop	8m 16s
test-jobEngineStartOfflineDevice	12m 11s
test-jobEngineStartOnlineDevice	10m 27s
test-jobEngineStepDefinitions	8m 8s
test-jobsAndScheduler	3m 7s
test-jobsIntegration	9m 35s
test-jobsIntegrationBase	8m 47s
test-RoleAndGroup	2m 55s
test-security	5m 34s
test-tag	2m 42s
test-user	3m 43s
test-userIntegration	8m 20s
test-userIntegrationBase	7m 51s
test-api-parsing	6m 22s
test-api-corsfilter	6m 32s
	4h 45m 19s

Provide feedback