Merge "Add user rights 'viewmywatchlist', 'editmywatchlist'"