Bugzilla 1098: remove another known-fixed Heartbleed entity from the blacklist.
Bugzilla 1039: no longer need to blacklist one entity because the one it clashed with no longer appears in eduGAIN metadata. It's still in the *verification* blacklist because it has a 1024-bit key.
Bugzilla 1082, 1096: resolve by blacklisting one IdP in each clashing pair.
Entity selected for blacklisting in each case selected in consultation with the originating registrar.