Merge branch '2017.7' into 46427_service_module_cumulus

.kitchen.yml

@@ -34,6 +34,9 @@ provisioner:
   log_level: info
   sudo: true
   require_chef: false
+  retry_on_exit_code:
+    - 139
+  max_retries: 2
   remote_states:
     name: git://github.com/saltstack/salt-jenkins.git
     branch: 2017.7

salt/engines/sqs_events.py

@@ -165,4 +165,6 @@ def start(queue, profile=None, tag='salt/engine/sqs', owner_acct_id=None):
     while True:
         if not q:
             q = sqs.get_queue(queue, owner_acct_id=owner_acct_id)
+            q.set_message_class(boto.sqs.message.RawMessage)
+
         _process_queue(q, queue, fire_master, tag=tag, owner_acct_id=owner_acct_id, message_format=message_format)

salt/state.py

@@ -703,8 +703,12 @@ class State(object):
             except AttributeError:
                 pillar_enc = str(pillar_enc).lower()
         self._pillar_enc = pillar_enc
-        if initial_pillar:
+        if initial_pillar and not self._pillar_override:
             self.opts['pillar'] = initial_pillar
+        else:
+            # Compile pillar data
+            self.opts['pillar'] = self._gather_pillar()
+            # Reapply overrides on top of compiled pillar
             if self._pillar_override:
                 self.opts['pillar'] = salt.utils.dictupdate.merge(
                     self.opts['pillar'],
@@ -712,8 +716,6 @@ class State(object):
                     self.opts.get('pillar_source_merging_strategy', 'smart'),
                     self.opts.get('renderer', 'yaml'),
                     self.opts.get('pillar_merge_lists', False))
-        else:
-            self.opts['pillar'] = self._gather_pillar()
         self.state_con = context or {}
         self.load_modules()
         self.active = set()