Merge branch 'backport-4039' into release-1.6.x #2441

Job	Run time
Build	3m 7s
test-broker	13m 22s
test-brokerAcl	13m 26s
test-device	3m 52s
test-connection	11m 9s
test-datastore	9m 5s
test-device-management	4m 13s
test-security	6m 2s
test-tag	3m 50s
test-jobs	7m 38s
test-triggerService	6m 18s
test-user	10m 6s
build-javadoc	4m 28s
junit-tests	6m 14s
test-account	7m 26s
test-jobEngineRestartOfflineDevice	10m 38s
test-jobEngineRestartOnlineDevice	8m 38s
test-jobEngineRestartOnlineDeviceSecondPart	8m 13s
test-jobEngineServiceStop	7m 3s
test-jobEngineStartOfflineDevice	11m 24s
test-jobEngineStartOnlineDevice	18m 6s
test-jobEngineStepDefinitions	4m 9s
	2h 58m 27s

Provide feedback