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

New: Proper etcd storage backend + events under /v1/feed
Because it is not something that can be replaced/provided. Every UserService must have its own collector.