Update executor changes from swarmkit

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 96a27cf0931974b602acfdd74dfcc5142500c7ba
Component: engine

components/engine/integration-cli/docker_cli_swarm_test.go

@@ -51,7 +51,7 @@ func (s *DockerSwarmSuite) TestSwarmInit(c *check.C) {
 	c.Assert(spec.Dispatcher.HeartbeatPeriod, checker.Equals, uint64(11*time.Second))
 
 	c.Assert(d.Leave(true), checker.IsNil)
-
+	time.Sleep(500 * time.Millisecond) // https://github.com/docker/swarmkit/issues/1421
 	out, err = d.Cmd("swarm", "init")
 	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))