locksrv/lock: Merge lockfile and noncefile
locksrv/lock: Merge lockfile and noncefile

- Write the nonce into the lockfile rather than using a separate nonce file

cmusatyalab/openisr,cmusatyalab/openisr,cmusatyalab/openisr,cmusatyalab/openisr,cmusatyalab/openisr