Includes: - https://github.com/docker/swarmkit/pull/1766 - https://github.com/docker/swarmkit/pull/1770 Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>