saltstack/salt — pull request #16746 by s0undt3ch (2014-10-19 17:25:38+00:00)
Title: Merge branch '2014.7' forward into develop

Conflicts fixed.

Conflicts:
*	salt/loader.py
*	salt/returners/carbon_return.py
*	salt/returners/couchbase_return.py
*	salt/returners/couchdb_return.py
*	salt/returners/elasticsearch_return.py
*	salt/returners/local_cache.py
*	salt/returners/memcache_return.py
*	salt/returners/mongo_future_return.py
*	salt/returners/mongo_return.py
*	salt/returners/mysql.py
*	salt/returners/odbc.py
*	salt/returners/postgres.py
*	salt/returners/redis_return.py
*	salt/returners/smtp_return.py
*	salt/returners/sqlite3_return.py
*	salt/states/dockerio.py
*	salt/utils/minions.py