Update to 3.5.10
    
    This closes the old FTBS bug bz#2171486 coincidentally.
    
    Also! Because CI fails, we add fixes for that.
    It is unrelated to 3.5.10, but it is a circular
    dependency. We cannot make a clean PR without those
    fixes. But without the fix for FTBS we cannot add the
    CI fixes alone.