git mod: status -> state_by_file, to avoid shadowing same-named func
Merge pull request #5076 from hulu/git-status-shadowing

git mod: status -> state_by_file, to avoid shadowing same-named func
grub_legacy: refactor to avoid shadowing conf() function
Merge pull request #5079 from hulu/grub-conf-shadowing

grub_legacy: refactor to avoid shadowing conf() function