Change the name for the keypinning file; delete the old one if found

This is a brute-force fix for #16580, wherein #16530 caused some
routers to do bad things with the old keypinning journal.