Fix testcases that expect trailing whitespace

and broken integration tests based of nil pointers

Signed-off-by: Daniel Nephin <dnephin@docker.com>

command/container/ps.go

@@ -111,13 +111,13 @@ func runPs(dockerCli *command.DockerCli, opts *psOptions) error {
 		if len(dockerCli.ConfigFile().PsFormat) > 0 && !opts.quiet {
 			format = dockerCli.ConfigFile().PsFormat
 		} else {
-			format = "table"
+			format = formatter.TableFormatKey
 		}
 	}
 
 	containerCtx := formatter.Context{
 		Output: dockerCli.Out(),
-		Format: formatter.NewContainerFormat(format, opts.quiet, opts.size),
+		Format: formatter.NewContainerFormat(format, opts.quiet, listOptions.Size),
 		Trunc:  !opts.noTrunc,
 	}
 	return formatter.ContainerWrite(containerCtx, containers)