config: merge in debian 3.14.4-1 config changes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>