Reduce the timeout for restart/stop
Merge branch 'master' into fix_tests