Bugfix: Expand deprecated work->subid field to int width, needed by klondike driver for tracking work
Bugfix: klondike: Reenable hw error reporting on nonces found for unknown work
Bugfix: erupter: Sapphire detected as Emerald and Emerald not detected

Conflicts:
	driver-erupter.c
Merge commit '111c9ef' into bfgminer-3.10.x