Always try to stop the container if it is not stopped

After some discussion, it seems both safe and desired to re-send the stop
command if things are not in the stopped state, and simply wait for that
command to finish as a signal that the container is actually stopped.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>