Merge branch 'master' into next

diff --combined config/rootfiles/core/158/filelists/backup
index 0000000000000000000000000000000000000000,38e28a8b46ab4285d1c78a118cdc0cd509dc0211..38e28a8b46ab4285d1c78a118cdc0cd509dc0211
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/157/filelists/backup
+++ b/config/rootfiles/core/158/filelists/backup
@@@ -1,0 -1,1 +1,1 @@@
+ ../../../common/backup

diff --combined config/rootfiles/oldcore/157/update.sh
index ce7b6f5bf647aec402b6cbe37a8cfb0b790dab7d,94b10723ff65cb260d35e2835163618ccadfd597..94b10723ff65cb260d35e2835163618ccadfd597
--- 1/config/rootfiles/oldcore/157/update.sh
--- 2/config/rootfiles/core/157/update.sh
+++ b/config/rootfiles/oldcore/157/update.sh
@@@ -97,6 -97,9 +97,9 @@@ extract_file
  # update linker config
  ldconfig
  
+ # Apply local configuration to sshd_config
+ /usr/local/bin/sshctrl
+ 
  # Update Language cache
  /usr/local/bin/update-lang-cache
  
@@@ -121,6 -124,10 +124,10 @@@ rm -f 
        /usr/lib/dma-mbox-create \
        /usr/lib/openssh/ssh-keysign
  
+ # Delete orphaned pppd 2.4.8 shared object files
+ rm -rf \
+       /usr/lib/pppd/2.4.8/
+ 
  # Start services
  /etc/init.d/sshd restart
  /etc/init.d/apache restart