Merge "Restored method for clearing a watchlist in web UI, and rebuilt code."