fix stop on goroutines to actually cleanly shutdown on app close

Sam Clark requested to merge dev into master

Merge request reports