Fix for two startup bugs (RC and important)

Jonathan Dupartrequested to merge
(removed):debian/stein into debian/stein

Here are two patches for bugs #924562 and #918320, both related to the fix of #878757.

Merge request reports