Merge pull request #44151 from rallytime/merge-2017.7

[2017.7] Merge forward from 2016.11 to 2017.7

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,4 +12,10 @@ Remove this section if not relevant
 
 Yes/No
 
+### Commits signed with GPG?
+
+Yes/No
+
 Please review [Salt's Contributing Guide](https://docs.saltstack.com/en/latest/topics/development/contributing.html) for best practices.
+
+See GitHub's [page on GPG signing](https://help.github.com/articles/signing-commits-using-gpg/) for more information about signing commits with GPG.

salt/cloud/clouds/opennebula.py

@@ -4571,7 +4571,8 @@ def _list_nodes(full=False):
                 pass
 
         vms[name]['id'] = vm.find('ID').text
-        vms[name]['image'] = vm.find('TEMPLATE').find('TEMPLATE_ID').text
+        if vm.find('TEMPLATE').find('TEMPLATE_ID'):
+            vms[name]['image'] = vm.find('TEMPLATE').find('TEMPLATE_ID').text
         vms[name]['name'] = name
         vms[name]['size'] = {'cpu': cpu_size, 'memory': memory_size}
         vms[name]['state'] = vm.find('STATE').text

salt/modules/state.py

@@ -893,8 +893,8 @@ def highstate(test=None, queue=False, **kwargs):
     finally:
         st_.pop_active()
 
-    if __salt__['config.option']('state_data', '') == 'terse' or \
+    if isinstance(ret, dict) and (__salt__['config.option']('state_data', '') == 'terse' or
-            kwargs.get('terse'):
+            kwargs.get('terse')):
         ret = _filter_running(ret)
 
     serial = salt.payload.Serial(__opts__)

salt/returners/local.py

@@ -3,7 +3,9 @@
 The local returner is used to test the returner interface, it just prints the
 return data to the console to verify that it is being passed properly
 
-  To use the local returner, append '--return local' to the salt command. ex:
+To use the local returner, append '--return local' to the salt command. ex:
+
+.. code-block:: bash
 
     salt '*' test.ping --return local
 '''