fix traverse_watchlist merge argument order

traverse_watchlist is used for example to check which users
should receive a notification. Unfortunately there was a bug that
resulted in completely wrong return values.
fix another issue in traverse_watchlist
Merge pull request #871 from xi/feature-fix-watchlist-merge

fix traverse_watchlist merge argument order