EntityDescriptor duplicated if explicitly added

[alexstuart]

If an IdP EntityDescriptor was due to be added from the algorithm, then explicitly adding it means that the EntityDescriptor is duplicated in the output.

Solution is to remove the explicitly added ones alongside the explicitly blocked ones.