Handle Gerrit Change-Ids for merge commits