Fix typo (blank line) in proxy controlfile
Merge branch 'deb/nightly' into deb/rc