When stopping service, wait until actually exited
When stopping service, wait until actually exited

Fixes issue #3548.

opavader/influxdb,mark-rushakoff/influxdb,m4ce/influxdb,archsaber/influxdb,tommymei/influxdb,GrimDerp/influxdb,mre/influxdb,toorop/influxdb,trigrass2/influxdb,nickrobinson/influxdb,jonseymour/influxdb,nickrobinson/influxdb,josephcopenhaver/influxdb,nooproblem/influxdb,Ancillas/influxdb,bluebreezecf/influxdb,tuxmonteiro/influxdb,otoolep/influxdb,bluebreezecf/influxdb,roobert/influxdb,jgeiger/influxdb,mnuessler/influxdb,jgeiger/influxdb,daachi/influxdb,DanielMorsing/influxdb,slavau/influxdb,archsaber/influxdb,Mindera/influxdb,imcom/influxdb,jipperinbham/influxdb,linearb/influxdb,DanielMorsing/influxdb,pablolmiranda/influxdb,apriendeau/influxdb,nckturner/influxdb,samaitra/influxdb,cnelissen/influxdb,n1tr0g/influxdb,n1tr0g/influxdb,jipperinbham/influxdb,CVTJNII/influxdb-tjnii,roobert/influxdb,tuxmonteiro/influxdb,slavau/influxdb,arussellsaw/influxdb,linearb/influxdb,li-ang/influxdb,slavau/influxdb,trigrass2/influxdb,kingland/influxdb,chenziliang/influxdb,trigrass2/influxdb,jgeiger/influxdb,Venu4thFeb/influxdb,CVTJNII/influxdb-tjnii,bluebreezecf/influxdb,mvadu/influxdb,apigee/influxdb,runner-mei/influxdb,CVTJNII/influxdb-tjnii,tommymei/influxdb,opavader/influxdb,nckturner/influxdb,josephcopenhaver/influxdb,influxdb/influxdb,opavader/influxdb,mark-rushakoff/influxdb,paulstuart/influxdb,kingland/influxdb,paulstuart/influxdb,apriendeau/influxdb,linearb/influxdb,kingland/influxdb,wxdublin/influxdb,cnelissen/influxdb,sudabon/influxdb,influxdata/influxdb,pkittenis/influxdb,pkittenis/influxdb,otoolep/influxdb,eminden/influxdb,jipperinbham/influxdb,linearb/influxdb,mnuessler/influxdb,paulstuart/influxdb,benbjohnson/influxdb,toorop/influxdb,lgpeterson/influxdb,mark-rushakoff/influxdb,Tony133/influxdb,influxdb/influxdb,Venu4thFeb/influxdb,mnuessler/influxdb,Mindera/influxdb,Tony133/influxdb,jonseymour/influxdb,samaitra/influxdb,mnuessler/influxdb,pablolmiranda/influxdb,apigee/influxdb,joaopedrotaveira/influxdb,kingland/influxdb,alexiri/influxdb,tommymei/influxdb,GrimDerp/influxdb,nckturner/influxdb,tuxmonteiro/influxdb,nooproblem/influxdb,jipperinbham/influxdb,DanielMorsing/influxdb,Tony133/influxdb,eminden/influxdb,mark-rushakoff/influxdb,apigee/influxdb,mvadu/influxdb,toorop/influxdb,arussellsaw/influxdb,alexiri/influxdb,m4ce/influxdb,Venu4thFeb/influxdb,Tony133/influxdb,pkittenis/influxdb,apriendeau/influxdb,runcom/influxdb,atyenoria/influxdb,samaitra/influxdb,alexiri/influxdb,mvadu/influxdb,mnuessler/influxdb,apriendeau/influxdb,mcanthony/influxdb,pkittenis/influxdb,wxdublin/influxdb,benbjohnson/influxdb,influxdb/influxdb,imcom/influxdb,mre/influxdb,nckturner/influxdb,mvadu/influxdb,pablolmiranda/influxdb,roobert/influxdb,cnelissen/influxdb,Mindera/influxdb,vladlopes/influxdb,n1tr0g/influxdb,daachi/influxdb,n1tr0g/influxdb,alexiri/influxdb,josephcopenhaver/influxdb,mre/influxdb,josephcopenhaver/influxdb,CVTJNII/influxdb-tjnii,trigrass2/influxdb,eminden/influxdb,mmaul/influxdb,opavader/influxdb,imcom/influxdb,arussellsaw/influxdb,vladlopes/influxdb,imcom/influxdb,mre/influxdb,nickrobinson/influxdb,archsaber/influxdb,apigee/influxdb,daachi/influxdb,mcanthony/influxdb,pablolmiranda/influxdb,jonseymour/influxdb,n1tr0g/influxdb,jgeiger/influxdb,cnelissen/influxdb,mark-rushakoff/influxdb,nickrobinson/influxdb,Ancillas/influxdb,samaitra/influxdb,jipperinbham/influxdb,roobert/influxdb,toorop/influxdb,GrimDerp/influxdb,CVTJNII/influxdb-tjnii,lenko-d/influxdb,slavau/influxdb,jgeiger/influxdb,GrimDerp/influxdb,bluebreezecf/influxdb,daachi/influxdb,paulstuart/influxdb,lenko-d/influxdb,lgpeterson/influxdb,atyenoria/influxdb,otoolep/influxdb,jonseymour/influxdb,otoolep/influxdb,runner-mei/influxdb,runcom/influxdb,opavader/influxdb,alexiri/influxdb,daachi/influxdb,chenziliang/influxdb,mmaul/influxdb,apriendeau/influxdb,slavau/influxdb,arussellsaw/influxdb,m4ce/influxdb,eminden/influxdb,runner-mei/influxdb,benbjohnson/influxdb,chenziliang/influxdb,otoolep/influxdb,toorop/influxdb,joaopedrotaveira/influxdb,arussellsaw/influxdb,mmaul/influxdb,influxdb/influxdb,eminden/influxdb,apigee/influxdb,runcom/influxdb,paulstuart/influxdb,atyenoria/influxdb,Venu4thFeb/influxdb,mcanthony/influxdb,roobert/influxdb,tommymei/influxdb,benbjohnson/influxdb,Ancillas/influxdb,jgeiger/influxdb,mvadu/influxdb,GrimDerp/influxdb,CVTJNII/influxdb-tjnii,lgpeterson/influxdb,Mindera/influxdb,imcom/influxdb,joaopedrotaveira/influxdb,josephcopenhaver/influxdb,samaitra/influxdb,mark-rushakoff/influxdb,wxdublin/influxdb,nickrobinson/influxdb,sudabon/influxdb,atyenoria/influxdb,linearb/influxdb,mnuessler/influxdb,m4ce/influxdb,samaitra/influxdb,Ancillas/influxdb,nooproblem/influxdb,lgpeterson/influxdb,atyenoria/influxdb,mvadu/influxdb,archsaber/influxdb,influxdata/influxdb,DanielMorsing/influxdb,tommymei/influxdb,n1tr0g/influxdb,m4ce/influxdb,lenko-d/influxdb,otoolep/influxdb,sudabon/influxdb,mmaul/influxdb,Mindera/influxdb,tuxmonteiro/influxdb,joaopedrotaveira/influxdb,influxdb/influxdb,lgpeterson/influxdb,chenziliang/influxdb,DanielMorsing/influxdb,cnelissen/influxdb,lenko-d/influxdb,wxdublin/influxdb,runcom/influxdb,jonseymour/influxdb,apigee/influxdb,nooproblem/influxdb,pkittenis/influxdb,Mindera/influxdb,mmaul/influxdb,Tony133/influxdb,daachi/influxdb,runner-mei/influxdb,m4ce/influxdb,Venu4thFeb/influxdb,sudabon/influxdb,jonseymour/influxdb,lenko-d/influxdb,jipperinbham/influxdb,sudabon/influxdb,influxdb/influxdb,runcom/influxdb,kingland/influxdb,li-ang/influxdb,vladlopes/influxdb,pablolmiranda/influxdb,Ancillas/influxdb,trigrass2/influxdb,sudabon/influxdb,nckturner/influxdb,vladlopes/influxdb,arussellsaw/influxdb,nooproblem/influxdb,wxdublin/influxdb,mre/influxdb,mcanthony/influxdb,joaopedrotaveira/influxdb,tuxmonteiro/influxdb,mcanthony/influxdb,bluebreezecf/influxdb,pkittenis/influxdb