etcd fix, few tests
Merge branch 'master' of github.com:WhackoJacko/Jetee