Paul,
It looks exactly like the one in the first picture but the little barrier strip on mine doesn't have the notches - just a plain plastic "wall".
I can understand the first one being "outlawed", but the two white ones with the screw and nut holding them together do meet the updated regs that you mention(requiring a plug that can only be taken apart with a tool).
I guess if I'm living in the UK and the molded-on shaver plug gets damaged, I'd have to go to Maplins and pick up one of these:
and plug it into one of these:
Are the white plugs available from real electrical suppliers or not at all anymore?