qa/168: being more careful with stop and start
qa/168: being more careful with stop and start

Seeing a race on some platforms ... not sure why but this change
seems to fix it.

adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp