mirror fixes for fdo#78906 and deb#766788 into icu

Change-Id: I9325bb28eb267b023f628e24fea216ad580759e9