increase timeout on stopping prior to termination
Merge branch 'develop' of https://github.com/daniellemayne/dasein-cloud-virtustream into develop