Merge "Add more light greylist entries." into pi-dev