Merge branch '2015.8' into '2016.3'

No conflicts.

salt/beacons/__init__.py

@@ -184,7 +184,8 @@ class Beacon(object):
         # Fire the complete event back along with the list of beacons
         evt = salt.utils.event.get_event('minion', opts=self.opts)
         b_conf = self.functions['config.merge']('beacons')
-        evt.fire_event({'complete': True, 'beacons': b_conf},
+        self.opts['beacons'].update(b_conf)
+        evt.fire_event({'complete': True, 'beacons': self.opts['beacons']},
                        tag='/salt/minion/minion_beacons_list_complete')
 
         return True

salt/modules/aws_sqs.py

@@ -2,6 +2,8 @@
 '''
 Support for the Amazon Simple Queue Service.
 '''
+
+# Import Python libs
 from __future__ import absolute_import
 import logging
 import json
@@ -162,6 +164,11 @@ def list_queues(region, opts=None, user=None):
 
     user : None
         Run hg as a user other than what the minion runs as
+
+    CLI Example:
+
+        salt '*' aws_sqs.list_queues <region>
+
     '''
     out = _run_aws('list-queues', region, opts, user)
 
@@ -187,6 +194,11 @@ def create_queue(name, region, opts=None, user=None):
 
     user : None
         Run hg as a user other than what the minion runs as
+
+    CLI Example:
+
+        salt '*' aws_sqs.create_queue <sqs queue> <region>
+
     '''
 
     create = {'queue-name': name}
@@ -216,6 +228,11 @@ def delete_queue(name, region, opts=None, user=None):
 
     user : None
         Run hg as a user other than what the minion runs as
+
+    CLI Example:
+
+        salt '*' aws_sqs.delete_queue <sqs queue> <region>
+
     '''
     queues = list_queues(region, opts, user)
     url_map = _parse_queue_list(queues)
@@ -263,6 +280,11 @@ def queue_exists(name, region, opts=None, user=None):
 
     user : None
         Run hg as a user other than what the minion runs as
+
+    CLI Example:
+
+        salt '*' aws_sqs.queue_exists <sqs queue> <region>
+
     '''
     output = list_queues(region, opts, user)