Merge branch 'backport-4081' into release-1.6.x #2691

Job	Run time
Build	2m 41s
test-broker	9m 35s
test-tag	3m 56s
test-brokerAcl	12m 26s
test-connection	11m 19s
test-datastore	7m 41s
test-device	3m 33s
test-device-management	4m 20s
test-user	9m 23s
test-account	8m 10s
test-jobEngineStartOfflineDevice	11m 17s
test-jobs	7m 53s
test-jobEngineStepDefinitions	4m 16s
test-security	6m 7s
test-triggerService	6m 46s
build-javadoc	4m 22s
junit-tests	6m 12s
test-jobEngineRestartOfflineDevice	10m 58s
test-jobEngineRestartOnlineDevice	9m 52s
test-jobEngineRestartOnlineDeviceSecondPart	8m 1s
test-jobEngineServiceStop	7m 45s
test-jobEngineStartOnlineDevice	9m 20s
	2h 45m 53s

Provide feedback