Pre-SaltConf changes
Pre-SaltConf patches.
Merge branch 'develop' of github.com:saltstack/salt into develop
Automatically resolve dependencies if deb file sourced.

 - Uses python-apt module to check for missing dependencies
    and resolve them using apt-get.

 - deb package is then installed in the previous fashion
Mark the missing dependencies as auto-installed.
Fixed a typo in variable name.
lint fixes. thanks jenkins!
Merge branch 'develop' of github.com:saltstack/salt into develop
Improve detection of changes when pull or build an image
Renaming salt.modules.apt to salt.modules.apt_pkg to import python-apt
Updated docstring and added versionchanged for salt.modules.apt_pkg.install
give repo_name only

fixup for f054d73
Rename js file to make minified file relationship clear
adding modjk state
added show global/variables
show variables, show global lint correction
Remove deleted resources.
Use `sys.stdout.write()` instead of `print()`.
According to the SunOS man page on flock:

	flock() applies or removes an advisory lock on the file associ-
     ated with the file descriptor fd. The compatibility version of
     flock() has been implemented on top of fcntl(2) locking.  It does
     not provide complete binary compatibility

This lack of binary compatibility results in some odd behavior when
running salt-master on a SunOS/SmartOS host. Specifically an IOError
[Errno 9] is thrown whenever the master calls the file_hash method.

Specifically it has to do with the fact that on SunOS/SmartOS the lock
is released when the file is closed,  whereas in Linux the lock is kept
until it is released. An article discussing the problem in detail can be
found here:

http://infinitesque.net/articles/2010/on%20Python%20flock/index.html

To get this working I changed salt/fileserver/roots.py to check os.uname()
to make sure it's not a SunOS host when setting HAS_FCNTL. Comments indicate
Windows shouldn't have this set either.
Merge pull request #10171 from s0undt3ch/develop

More doc translations stuff