Finished SVY-7114: Improve portal and property type watches

I implemented the watch scope changes as part of another case recently
which was reviewed/validated (the one that also added separate service
scopes for watches).

This commit just takes case of removing obsolete row watches and data in
portals.