Merge pull request docker-archive#417 from frodenas/fix-createentries

Ignore empty addresses when creating discovery entries

Merge pull request docker-archive#365 from vieux/add_cpus_mem

Add cpus mem

Merge pull request docker-archive#366 from aluzzardi/tls-fix

TLS Fixes.

Merge pull request docker-archive#327 from aluzzardi/vieux-fix_match

Fix affinity matching.

Merge pull request docker-archive#261 from vieux/chanwit-constraints-…

…expr

Proposal: constraint & affinity filter expression enhancement