miner: Consider nonces vs pdiff in the watchdog
Merge branch 'feature/watchdog-consider-nonces' into feature/watchdog-reinit-gc3355

Conflicts:
	miner.c
	miner.h