Merge pull request #13628 from s0undt3ch/2014.1

[2014.1] Update to latest bootstrap-script.sh, v2014.06.21
Changes in default auth settings

Per @whiteing in #11781 and @UtahDave, these options should be
set as default to provide minion re-auth flooding.

Closes #11326.

Conflicts:
	salt/config.py
Fix ext_nodes breakage on 2014.1 branch
Merge pull request #13739 from cro/ext_nodes_breakage_2014.1

Fix ext_nodes breakage
Added mount.active functionality for Solaris.
Fix support for allow-hotplug statement in debian_ip network module

When an existing interface was configured with allow-hotplug or when setting
"hotplug: True" in network.managed state, this was not taken into account and
the allow-hotplug setting would be removed from /etc/network/interfaces.

This patch fixes this issue.
add sqlite to the esky builds
Make jobs.active work correctly.

* Fixed output of running minions (#9526)
* Correctly identify returned minions.
Remove outdated documentation
Switch to new dynamic transport loader.
Support eauth in batch mode
Update to tomcat.py

-Added "force" (default false) option commensurate with force option in salt.modules.tomcat.deploy_war to allow forced deployment of a .war even if the version strings match.
-Forced successful deploy comment to be a string instead of dict to compensate for https://github.com/saltstack/salt/issues/12840
Conflicts:
	salt/states/tomcat.py
Update tomcat.py
Prevent a keyerror when cloud mapping

removed the requirement that 'minion' must be in nodedata if 'minion' is in overrides. this requirement threw a keyerror on me.
copy and rename should pass name instead of dname when makedirs is true
open files with 'rb'

Windows needs this to be opened with 'rb' to avoid stacktraces.

Conflicts:
	salt/utils/schedule.py
Catch exceptions when deserializing

Conflicts:
	salt/payload.py
Add 2014.1.6 release notes
DIE TRAILING WHITESPACE DIE
Should be 'not in'