Merge branch 'backport-4080' into release-1.7.x #2683

Job	Run time
Build	2m 25s
test-brokerAcl	12m 26s
test-tag	3m 49s
test-device	3m 33s
test-broker	9m 41s
test-device-management	4m 14s
test-connection	11m 17s
test-datastore	7m 49s
test-user	9m 20s
test-account	8m 1s
test-jobEngineStartOfflineDevice	11m 29s
test-jobEngineStepDefinitions	4m 30s
test-jobs	8m 16s
test-security	6m 36s
test-triggerService	6m 26s
junit-tests	6m 15s
test-jobEngineRestartOfflineDevice	10m 53s
test-jobEngineRestartOnlineDevice	8m 39s
test-jobEngineRestartOnlineDeviceSecondPart	7m 52s
test-jobEngineServiceStop	8m 30s
test-jobEngineStartOnlineDevice	9m 33s
build-javadoc	4m 41s
	2h 46m 15s

Provide feedback