Merge "watcheditem: Fix bad $options param in NoWriteWatchedItemStore::countWatchersM...