Update pnfsimulator code to master.