Merge "Remove stale generate-whitelist.sh"