Merge "Remove B/C classes WatchlistEditor and IPBlockForm"