npm state: installed -> installed_pkgs, to avoid shadowing func of same name
extfs module: blocks -> free_blocks, to avoid shadowing same-named func
auth.ldap: avoid shadowing builtins: dict->variables, filter->filter_
debconfmod: type -> type_, to avoid shadowing built-in type 'type'
pydsl: id -> state_id, to avoid shadowing the built-in func
win_service mod: status -> statuses, to avoid shadowing same-named func
rename/refactor to avoid shadowing version() functions
network mod: rename subnets -> subnetworks, to avoid shadowing func
file state: exists -> extant, to avoid shadowing same-named func
file mod: rm unnecessary temp var to avoid shadowing outer mkdir() func
Merge pull request #5070 from hulu/installed-shadowing

npm state: installed -> installed_pkgs, to avoid shadowing func of same name
Merge pull request #5071 from hulu/blocks-shadowing

extfs module: blocks -> free_blocks, to avoid shadowing same-named func
Merge pull request #5073 from hulu/ldap-builtin-shadowing

auth.ldap: avoid shadowing builtins: dict->variables, filter->filter_
Merge pull request #5074 from hulu/debconfmod-shadow-type

debconfmod: type -> type_, to avoid shadowing built-in type 'type'
Merge pull request #5075 from hulu/pydsl-id-shadowing

pydsl: id -> state_id, to avoid shadowing the built-in func
Merge pull request #5077 from hulu/winserv-status-shadowing

win_service mod: status -> statuses, to avoid shadowing same-named func
Merge pull request #5078 from hulu/version-shadowing

rename/refactor to avoid shadowing version() functions
Merge pull request #5080 from hulu/network-subnets-shadowing

network mod: rename subnets -> subnetworks, to avoid shadowing func
Merge pull request #5082 from hulu/file-mkdir-shadowing

file mod: rm unnecessary temp var to avoid shadowing outer mkdir() func
Merge pull request #5083 from hulu/file-exists-shadowing

file state: exists -> extant, to avoid shadowing same-named func