Don't NPE generating CommitJsonData for merges There is still more work to do to handle merges, but an empty list is better than an error. Change-Id: I3efe7fe17f34f6d7f0ba7dcb074ae7374a022361