Use /usr/local/etc/salt as fallback CONFIG_DIR only on FreeBSD
the site reload is breaking macos states!!!!

@basepi, if this line is in 2014 [please cherrypick
Detect AES key changes in _fire_master

This is a follow up to 8ba9543, which changed the fire_master
implementation to use existing AES key instead of re-authenticating.

That change caused a problem in use cases which send a lot of events
but don't run jobs, because when the AES key changed, the minion
would never notice, and keep sending messages with the old key
indefinitely.

This change adds an attempt to decrypted to response to the sent
event, and to re-authenticated if the response can't be decrypted
in order to handle AES key changes.
Fix #11919: handling exceptions in scheduled jobs

Improvements:

 1. Catch exceptions from scheduled jobs and log them.
 2. Only silence OSErrors removing proc file if it's an EEXIST:
 otherwise log it
 3. Put the /var/cache/salt/minion/proc/<jid> deletion in a finally:
 block
 4. Only respect a "running" job as such if its PID really exists
Change in FreeBSD user add() home parameter handling.

Previously the module used -b to create a home directory that caused
some bugs. Change the module to use -d argument. This will fix the
issues when salt user defines a unusual home parameter and will also
fulfill the requirement that home directory's base directory should not
be created automatically.
Fix 32-bit packages of different arches than the CPU arch

This fixes an issue in which i386 packages were being identified as
pkgname.i386 on an i686 CPU.
Add release notes for 2014.1.2
Merge pull request #12012 from terminalmage/release-notes-2014.1

Add release notes for 2014.1.2 (2014.1 branch)
bump version to 2014.1.2
Don't fail on zmq import
Update to latest bootstrap-script.sh, v2014.04.16