[Bug 631815] Rebase patches in evolution package