Merge "(bug 31704) Allow selection of associated namespace on the watchlist"