rename patch foo2 to bug 884887. rebased the patch
rebase 'foo' patch
rename 'foo' to bug-880868
more work for bugs 880868 and 884887