Merge branch 'backport-4080' into release-2.0.x #2684

Job	Run time
Build	6m 50s
test-tag	2m 38s
test-device	5m 18s
test-accountAndTranslator	6m 24s
test-broker	27m 22s
test-brokerAcl	18m 0s
test-connection	14m 28s
test-datastore	15m 35s
test-device-management	12m 48s
test-jobsIntegration	9m 57s
test-jobsAndScheduler	3m 0s
test-jobsIntegrationBase	9m 45s
test-security	5m 28s
test-user	3m 54s
test-userIntegration	8m 51s
test-userIntegrationBase	8m 16s
build-javadoc	10m 16s
junit-tests	8m 35s
test-api-auth	6m 52s
test-deviceRegistry	12m 48s
test-endpoint	8m 0s
test-jobEngineRestartOfflineDevice	10m 49s
test-jobEngineRestartOnlineDevice	12m 1s
test-jobEngineRestartOnlineDeviceSecondPart	11m 54s
test-jobEngineServiceStop	12m 47s
test-jobEngineStartOfflineDevice	12m 24s
test-jobEngineStartOnlineDevice	14m 7s
test-jobEngineStepDefinitions	8m 25s
test-RoleAndGroup	2m 46s
test-api-corsfilter	6m 47s
	4h 57m 5s

Provide feedback