Merge "Retry dist-upgrades" into release/proposed/2019.2.0