fix whitesource issues

3 jobs for !267 with test-whitesource in 53 minutes and 34 seconds (queued for 2 seconds)
latest merge request