SCRUM#611: Prevents conflicts during dist-upgrade

1 job for issue/611 in 12 seconds (queued for 2 seconds)