address review comments for bug 877262, including split into two patches
rename the patch file for bug-877262