Control: retitle -1 diversions for linkers and gcc-6 need an update gcc-6 6.2.0-4 now ships the triplet prefixed names as files, and the unprefixed names as symlinks. The hardening-wrapper diversions need an update.