Merge branch feature/jorgen.lind/aws_kill_client_before_deinit with...

Merge branch feature/jorgen.lind/aws_kill_client_before_deinit with refs/heads/master into refs/merge-requests/137/train
3 jobs for !137 with feature/jorgen.lind/aws_kill_client_before_deinit into master in 6 minutes and 52 seconds (queued for 1 second)
merge train