Remove unnecessary differences between branch-2 and trunk patches