chore(tests): update etcd to match CoreOS 402.2.0

https://github.com/coreos/etcd/releases/tag/v0.4.6
Merge pull request #1638 from mboersma/update-etcd-tester

chore(tests): update etcd to match CoreOS 402.2.0
fix(controller): store limit fields on config

Having a separate "Limit" domain object was getting in our way, when
really it represents just an extension of a Config. This moves the
two JSON fields "cpu" and "memory" to Config and does away with Limit.
fix(controller): specify dicts as defaults and guard against old errors

We should have been initializing our JSONFields with dict objects, not
strings. Also upgrading from a slightly earlier version of Deis to this
change could hit a JSON encoding error, so catch that and use the chance
to clean up the data.