Merge support for watch-only addresses

Based on a patch by Eric Lombrozo.