Stabilize tests and bump etcd libraries [#74312764]

* Etcd (and libraries) bump to versions currently in cf-release
* Refactor and improve stability of store tests

Signed-off-by: John Tuley <jtuley@pivotallabs.com>