merge branch 'pr-1353'

Closes #1353
LGTMs: @hqhq @cyphar

exec.go

@@ -115,7 +115,7 @@ func execProcess(context *cli.Context) (int, error) {
 		return -1, err
 	}
 	if status == libcontainer.Stopped {
-		return -1, fmt.Errorf("cannot exec a container that has run and stopped")
+		return -1, fmt.Errorf("cannot exec a container that has stopped")
 	}
 	path := context.String("process")
 	if path == "" && len(context.Args()) == 1 {

start.go

@@ -47,7 +47,7 @@ your host.`,
 					hasError = true
 				}
 			case libcontainer.Stopped:
-				fmt.Fprintln(os.Stderr, "cannot start a container that has run and stopped")
+				fmt.Fprintln(os.Stderr, "cannot start a container that has stopped")
 				hasError = true
 			case libcontainer.Running:
 				fmt.Fprintln(os.Stderr, "cannot start an already running container")