added -s in docker stop and restart to choose grace period

Fixes #261