Auto stash before merge of "master" and "master/master"

Remove go-reap and use tini as process reaper

controllers/nginx/pkg/cmd/controller/main.go

@@ -23,14 +23,10 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	go_reap "github.com/hashicorp/go-reap"
-
 	"k8s.io/ingress/core/pkg/ingress/controller"
 )
 
 func main() {
-	go go_reap.ReapChildren(nil, nil, nil, nil)
-
 	// start a new nginx controller
 	ngx := newNGINXController()
 	// create a custom Ingress controller using NGINX as backend

controllers/nginx/pkg/cmd/controller/nginx.go

@@ -53,8 +53,6 @@ const (
 
 	defaultStatusModule statusModule = "default"
 	vtsStatusModule     statusModule = "vts"
-
-	errNoChild = "wait: no child processes"
 )
 
 var (
@@ -354,7 +352,7 @@ func (n NGINXController) testTemplate(cfg []byte) error {
 		return err
 	}
 	out, err := exec.Command(n.binary, "-t", "-c", tmpfile.Name()).CombinedOutput()
-	if err != nil && err.Error() != errNoChild {
+	if err != nil {
 		// this error is different from the rest because it must be clear why nginx is not working
 		oe := fmt.Sprintf(`
 -------------------------------------------------------------------------------