[Wikitech-l] Caveat: git merge and git cherry-pick don't add "Change-Id" by default