fixes #1916 - ensures service is shutdown/killed after provider logout
Merge pull request #290 from n8fr8/bug_1916_cant_close

fixes #1916 - ensures service is shutdown/killed after provider logout
Merge branch 'upstream' into word