Merge branch 'backport-4062' into release-1.6.x #2585

Job	Run time
Build	3m 15s
test-broker	6m 55s
test-tag	4m 15s
test-brokerAcl	11m 46s
test-connection	11m 5s
test-device	3m 41s
test-device-management	4m 5s
test-account	7m 39s
test-datastore	6m 42s
test-jobs	7m 53s
test-triggerService	6m 16s
test-security	6m 5s
test-jobEngineStepDefinitions	4m 11s
test-user	8m 49s
build-javadoc	4m 21s
junit-tests	6m 14s
test-jobEngineRestartOfflineDevice	10m 35s
test-jobEngineRestartOnlineDevice	8m 59s
test-jobEngineRestartOnlineDeviceSecondPart	7m 36s
test-jobEngineServiceStop	8m 5s
test-jobEngineStartOfflineDevice	11m 0s
test-jobEngineStartOnlineDevice	9m 34s
	2h 39m 1s

Provide feedback