remove zapwallettx command line
add rescan (default=true) parameter to zapwallettx rpc