feat test both of the condidtion
Merge branch '0.2' of https://github.com/coreos/etcd into 0.2
Merge pull request #235 from xiangli-cmu/0.2

Test both of the condition if given
Remove functional tests.
Merge pull request #236 from benbjohnson/remove-functional-tests

Remove functional tests.