Merge branch 'backport-3355' into release-1.7.x #2577

Job	Run time
Build	2m 56s
test-broker	7m 8s
test-brokerAcl	11m 37s
test-datastore	6m 27s
test-device-management	4m 3s
test-device	3m 45s
test-user	8m 46s
test-tag	3m 54s
test-account	7m 28s
test-connection	11m 9s
test-jobEngineRestartOfflineDevice	10m 41s
test-jobEngineStartOfflineDevice	11m 0s
test-jobEngineStartOnlineDevice	9m 29s
test-jobEngineStepDefinitions	4m 12s
test-jobs	7m 49s
test-security	6m 16s
test-triggerService	6m 20s
build-javadoc	4m 22s
junit-tests	6m 20s
test-jobEngineRestartOnlineDevice	9m 2s
test-jobEngineRestartOnlineDeviceSecondPart	8m 3s
test-jobEngineServiceStop	7m 47s
	2h 38m 34s

Provide feedback