Merge "Add a couple log errors to whitelist.yaml"