Fix bug where 2nd Gen firestore functions were mistakenly parsed as pubsub function#6456

taeold merged 3 commits intomasterfirebase/firebase-tools:masterfrom

dl-v2-firestorefirebase/firebase-tools:dl-v2-firestoreCopy head branch name to clipboard