Sync with Debian 1.154.4-1; some config/script updates