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
/usr/bin/env python -> /usr/bin/python in scripts
added ability to activate a virtualenv before 
running pip install
Use the 'rev' arg in git.rebase, Fix #4767
Add to doc examples for remote rebases
Merge pull request #5096 from basepi/rebase4767

Use the 'rev' arg in git.rebase, Fix #4767
grains/core : add useful information from SmartOS zone

This patch is intended for SmartOS users who are using OS
virtualization. You can now have access to :

- pkgsrcversion

- imageversion
reg mod: add space after comma to satisfy pylint
Merge pull request #5100 from cvrebert/patch-1

reg mod: add space after comma to satisfy pylint
netbsdservice mod: add space after comma to satisfy pylint
Merge pull request #5101 from cvrebert/patch-1

netbsdservice mod: add space after comma to satisfy pylint
actually stop shadowing
Merge pull request #5081 from hulu/file-comment-shadowing

file state: refactor to avoid shadowing comment() func; optimization too
pkgin mod: rm unused import of the os module
runners.manage: rm unused import of shutil
Add docstring per #5105
Add docstring per #5105
Fix #5105