* Merge from debian unstable. (LP: #715057) Remaining changes: - debian/patches/disable-avahi-browse.diff: Disable avahi-browse since it scales poorly in the current form: + Refresh patch - debian/patches/apt-get-changelog.patch: + Re-work patch because contrib dir no longer exists in upstream distribution. * Dropped chages, applied upstream: - Fix p4 completion - Fix typo in openssl completion - Fix error while loading service(8) completions