Conflicts:
	NEWS (trivial)
	configure.ac (trivial)
	daemons/ensure-dirs.in (deleted)

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>