finish merging 0.39, missed a conflict
finish merging 0.39, missed a conflict

Change-Id: Id54682c24045204f19989e1d5b33f770823d137f

wikimedia/operations-debs-carbon-c-relay,wikimedia/operations-debs-carbon-c-relay,wikimedia/operations-debs-carbon-c-relay