Merged upstream master. New: Proper etcd storage backend + events under ...

New: Proper etcd storage backend + events under /v1/feed