fix(server): try and add a expire dir test

This doesn't actually work yet.
Merge branch 'add-expire-dir-test' of https://github.com/philips/etcd into fix_expire_notify
fix TestV2WatchKeyInDir test