Fix #5102
netbsd_sysctl: fix pylint W1401 (Anomalous backslash in string)
cpu_times -> times, to avoid shadowing same-named func
Merge pull request #5108 from cvrebert/patch-5

netbsd_sysctl: fix pylint W1401 (Anomalous backslash in string)
Merge pull request #5113 from hulu/cputimes-shadowing

cpu_times -> times, to avoid shadowing same-named func
clean up zpool and fix #5114
sentry_return: returner.connect_sentry() being called w/ too many args
fix pylint W1401 (Anomalous backslash in string) problems in grains.core
win_pkg mod: actually invoke refresh_db
netbsdservice mod: status -> service_status, to avoid shadowing status() func
win_useradd: info -> user_info, to avoid shadowing info() func
Merge pull request #5115 from hulu/sentry_return

sentry_return: returner.connect_sentry() being called w/ too many args
Merge pull request #5116 from hulu/grains-backslashes

fix pylint W1401 (Anomalous backslash in string) problems in grains.core
Merge pull request #5117 from cvrebert/patch-1

win_pkg mod: actually invoke refresh_db
Merge pull request #5118 from hulu/netbsdservice-shadowing

netbsdservice mod: status -> service_status, to avoid shadowing status()
Merge pull request #5119 from hulu/win_useradd-shadowing

win_useradd: info -> user_info, to avoid shadowing info() func
Fix #5121
file state: refactor to avoid shadowing comment() func; optimization too
grains/core : fix fqdn / domain return on SunOS systems

getfqdn() on Solaris platforms returns the unqualified hostname. In
that case, using gethostname() could be a solution.

Tested on SmartOS / Solaris 11
yumpkg5: Comment indicates this is used on python >= 2.6 instead of < 2.6