tabs -> spaces
fix spacing to comply with PEP 8
zpool mod: rm random space
Merge pull request #5284 from hulu/style-fixes

Style fixes
Merge pull request #5283 from toddejohnson/develop

Fix xinetd service name to not have appended : in service name.
Don't pass jid in non-full return per #4402