Merge pull request #4990 from auser/patch-1

Updated key.py to fix isue #4989
Fix #4980, This has been here for a while and is clearly wrong
salt/grains : fix detection of osrelease for SmartOS
This will print the user who initiated the job
So you can see who has an active job running
and when printing a job result who has initiated it.
This will help auditing a salt job
salt/grains : better detection of cpu_model on SunOS platforms

Old version only gives cpu_model on SPARC platforms, but x86
platforms shows only "x86". By using cpu_info:*:brand instead of
cpu_info:*:implementation, you will get something as :
"Intel(r) Xeon(r) CPU E5-2630 0 @ 2.30GHz"
salt/grains : add SunOS cpu_flags support

Tested on :

- SunOS 5.11 both sparc and x86

- SmartOS joyent_20130405T010449Z
Add useradd function to apache.py
Add userdel function to apache.py
Add options to useradd in apache.py
Merge pull request #4996 from techhat/apache

Adding htpasswd functions to apache execution module
Make our life easier when passing an exit code and message to `SaltSyetemExit`.
Minor formating changes.
Don't just exit! Allow the exit to be catch and be handled on the CLI code.
Handle DNS check issues. Fixes #4988. Refs saltstack/salt-bootstrap#122.
Catch more socket errors. Fixes saltstack/salt-bootstrap#122
Complete the fix for #4980 started in 31b2574194d5333c65aec34c916609bad4b9490d

* Minor PEP8 and formatting changes.
Merge pull request #4991 from virtua-network/develop

salt/grains : fix detection of osrelease for SmartOS
Merge pull request #4992 from aboe76/salt_job_print_user

Feauture: Salt runner jobs.py add user to active and printed jobs.
Merge pull request #4997 from s0undt3ch/develop

Improved handling of dns_check
Rename locale module to localemod so it does not shadow python lib