config: merge debian 3.16.7

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