$Watchers is a group; ->Type has been deprecated in favor of ->Name, since 71fcde3
Principal->ObjectId was deprecated in f70178f

Switch to using Principal->Id as suggested.
Merge branch '4.2/watcher-type-deprecation' into 4.2.0-releng