* Merge from debian unstable. Remaining changes: (LP: #707756) - debian/control: + Build-Depends: Replace libssh2-1-dev with openssh-server. Drop stunnel since it's in universe, as well. + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends. Above changes are necessary to be independent from the universe.