newsticker: Prevent multiple "Could not download..." messages.  Fixes bug#19166.

* lisp/net/newst-backend.el (newsticker--get-news-by-url-callback):
Pass correct status to `newsticker--sentinel-work'.
(newsticker--sentinel-work): Use "newsticker--download-error" as
guid in order to prevent multiple "Could not download..."
messages.  Fixes bug#19166.

* lisp/net/newst-treeview.el (newsticker--treeview-item-show): Check
window liveliness before measuring its width.
* lisp/vc/diff-mode.el (diff-kill-applied-hunks): New command.
* lisp/vc/smerge-mode.el (smerge-swap): New command.
* lisp/vc: Fix use of find-conflicted-file in Git.

* lisp/vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the
current "project" rather than just the current directory.
* lisp/vc/vc-git.el (vc-git-conflicted-files): Clarify in which directory
the file names make sense.
* admin/update_autogen: Fix bogosity introduced in 2014-11-16 merge.
ChangeLog fixes.
Auto-commit of loaddefs files.
ChangeLog fix
shr-dom-print dom.el changes

* net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the
dom.el changes.
bzr-state randomly/unpredictably fails on non-bzr files.