Merge "Do not generate watchlist test report in production config" into pi-dev