Make deadman_buttons optional (none by default)
Merge branch 'hydro-backport' into fuerte-devel