Merge branch 'backport-3355' into release-1.6.x #2575

Job	Run time
Build	4m 37s
test-brokerAcl	0s
test-broker	0s
test-device	0s
test-tag	0s
test-connection	0s
test-datastore	0s
test-device-management	0s
test-user	0s
test-account	0s
test-jobs	0s
test-security	0s
test-triggerService	0s
test-jobEngineRestartOfflineDevice	0s
test-jobEngineRestartOnlineDevice	0s
test-jobEngineStartOfflineDevice	0s
test-jobEngineStartOnlineDevice	0s
test-jobEngineStepDefinitions	0s
build-javadoc	0s
junit-tests	0s
test-jobEngineRestartOnlineDeviceSecondPart	0s
test-jobEngineServiceStop	0s
	4m 37s

Provide feedback