Fix importprivkey / rescan

Conflicts:
	src/rpcdump.cpp