Merge proposals dependent on lp://qastaging/~pawciobiel/testdrive/1187173-rsync-connection-timeout

1. 1187173-rsync-connection-timeout
2. Dependent merge proposals