Initial ipv6 / iptables work
Extend container_bridge.py (salt lib) to support IPv6
Allow specification of docker daemon args
Add self links to objects sent down the watch channel.
Remove test verbosity; makes it hard to find failures when travis reports one.
UDP services need UDP portals
Merge pull request #2190 from lavalamp/fix2

Remove test verbosity
Make Fluentd/Elasticsearch logging support be robust to log rotation
Formatting tweaks to docs/api-conventions.md
Add etcd to the list of services to validate.
Also add minions.
Refactor selectHost in generic_scheduler
POST synchronously so following GET will succeed.

Should reduce flakiness of this test.
Add a test for selectHost of generic_scheduler
Merge pull request #2194 from ghodss/patch-2

Formatting tweaks to docs/api-conventions.md
Merge pull request #2196 from erictune/flaky_auth_test

POST synchronously so following GET will succeed.
Fix json serialization consistency
Merge pull request #2075 from derekwaynecarr/issue_2070

Fix json serialization consistency
fix example usage of passing environment variables

The syntax is not envVar, that is the name of the internal struct.  The
list is just "env"
Merge pull request #2200 from eparis/example-env-fix

fix example usage of passing environment variables
Merge pull request #2193 from satnam6502/fluentd-ek

Make Fluentd/Elasticsearch logging support be robust to log rotation