Merge "Re-add light-greylist entries incorrectly removed with icu entries"