Fix conditional on grains.docker_opts in docker-defaults

(cherry picked from commit 0007257bce01dd7637fd673dcf3aa656c53f64b3)
Kubernetes version v0.6.1
Kubernetes version v0.6.1-dev
Merge pull request #2810 from jlowdermilk/release-0.6

Create release 0.6.1