Fix importprivkey / rescan

Conflicts:
	src/rpcdump.cpp
importprivkey: Don't throw error in case a key is already there