Remove B/C classes WatchlistEditor and IPBlockForm

There was a rename of these classes in 1.18
For backward compatibility the old name was extending the new one.

Change-Id: I8251fb00ced5c3b474f29b245d89d0d3fb2c14da
Merge "Remove B/C classes WatchlistEditor and IPBlockForm"