etcdserver/etcdhttp: store location adjustment

Detailed adjustment:
/_etcd/machines/* -> /0/members/*
/* -> /1/*

And it keeps key path returned to user the same as before.

fixes #1331
... since this needs an associated test?