[18.09] backport update containerd to v1.1.4

[thaJeztah]

backport of moby#37925 for 18.09

git checkout -b 18.09_backport_bump_containerd_1.1.4 ce-engine/18.09
git cherry-pick -s -S -x b3c3c7a5a310ba340f1a86a4a708de34b9602e74
git push -u origin

cherry-pick was clean

Fixes a potential content store bug, backported from 1.2

• v1.1.3 release notes: https://github.com/containerd/containerd/releases/tag/v1.1.3
• v1.1.4 release notes: https://github.com/containerd/containerd/releases/tag/v1.1.4

Full diff: containerd/containerd@v1.1.2...v1.1.4

changes;

• [release/1.1] Fix options ordering in proto api txt files containerd/containerd#2473 [release/1.1] Fix options ordering in proto api txt files
• [release/1.1] native: set '/' permission to 0755 containerd/containerd#2488 [release/1.1] native: set '/' permission to 0755
• [release/1.1] Move ContainerFlags to "commands" package containerd/containerd#2472 [release/1.1] Move ContainerFlags to "commands" package
• Update cri plugin to v1.0.5. containerd/containerd#2539 Update cri plugin to v1.0.5
• [release/1.1] Cherrypick "Set gid 0 when no group is specified" and docs update containerd/containerd#2556 [release/1.1] Cherrypick "Set gid 0 when no group is specified" and docs update
• [release/1.1] Cherrypick: Support >= 128 layers in overlayfs snapshots containerd/containerd#2600 [release/1.1] Cherrypick: Support >= 128 layers in overlayfs snapshots
• [release/1.1] Backport: With-helper for supplemental gid support containerd/containerd#2637 [release/1.1] Backport: With-helper for supplemental gid support
• [release/1.1] Backport: Support uid in WithAdditionalGIDs containerd/containerd#2645 [release/1.1] Backport: Support uid in WithAdditionalGIDs
• [release/1.1] Update cri to f117382467baf182382c44332bfbf488effc34bb. containerd/containerd#2657 [release/1.1] Update cri to f117382467baf182382c44332bfbf488effc34bb.
• [release/1.1] Backported: check exists on content commit + testcase containerd/containerd#2654 [release/1.1] Backported: check exists on content commit + testcase
• [release/1.1] Backport: Add flag to ctr for running with NoNewPrivileges: false containerd/containerd#2668 [release/1.1] Backport: Add flag to ctr for running with NoNewPrivileges: false
• [release/1.1] Update continuity containerd/containerd#2677 [release/1.1] Update continuity

[thaJeztah]

Janky failure on a flaky test (TestSwarmClusterRotateUnlockKey) moby#33041

PowerPC; https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/11602/console is being looked into in moby#37958

20:32:07 FAIL: docker_cli_swarm_test.go:340: DockerSwarmSuite.TestSwarmContainerEndpointOptions
20:32:07 
20:32:07 [d0b1c9e2e0caa] waiting for daemon to start
20:32:07 [d0b1c9e2e0caa] daemon started
20:32:07 
20:32:07 docker_cli_swarm_test.go:348:
20:32:07     c.Assert(err, checker.IsNil, check.Commentf("%s", out))
20:32:07 ... value *exec.ExitError = &exec.ExitError{ProcessState:(*os.ProcessState)(0xc423b5b4e0), Stderr:[]uint8(nil)} ("exit status 125")
20:32:07 ... 7sfg7muxzslvj1tax7sm3arxp
20:32:07 
20:32:07 
20:32:07 [d0b1c9e2e0caa] exiting daemon

WindowsRS1 https://jenkins.dockerproject.org/job/Docker-PRs-WoW-RS1/22460/console failure looks like a known issue; see moby#37820

20:35:01 FAIL: docker_cli_start_test.go:189: DockerSuite.TestStartReturnCorrectExitCode
20:35:01 
20:35:01 docker_cli_start_test.go:198:
20:35:01     c.Assert(exitCode, checker.Equals, 12)
20:35:01 ... obtained int = 125
20:35:01 ... expected int = 12
20:35:01 

z failure looks the same as PowerPC; https://jenkins.dockerproject.org/job/Docker-PRs-s390x/11471/console

20:15:12 FAIL: docker_cli_swarm_test.go:340: DockerSwarmSuite.TestSwarmContainerEndpointOptions
20:15:12 
20:15:12 [d50ebe9d931c7] waiting for daemon to start
20:15:12 [d50ebe9d931c7] daemon started
20:15:12 
20:15:12 docker_cli_swarm_test.go:348:
20:15:12     c.Assert(err, checker.IsNil, check.Commentf("%s", out))
20:15:12 ... value *exec.ExitError = &exec.ExitError{ProcessState:(*os.ProcessState)(0xc420980a60), Stderr:[]uint8(nil)} ("exit status 125")
20:15:12 ... w1wj9dphvuwankcx2h5bv5rc5
20:15:12 
20:15:12 
20:15:12 [d50ebe9d931c7] exiting daemon

[thaJeztah]

Included in [18.09 backport] Update containerd to v1.2.1-rc.0 #121

[andrewhsu]

this fix is already included in #121