Merge pull request #28543 from gtmanfred/2015.8

clean up changes for pkg.uptodate and supervisord.dead

salt/states/pkg.py

@@ -1810,8 +1810,8 @@ def uptodate(name, refresh=False, **kwargs):
     if updated.get('result') is False:
         ret.update(updated)
     else:
-        ret['changes'] = updated
-        ret['comment'] = 'Upgrade successful.'
+        ret['changes'] = updated.get('changes', {})
+        ret['comment'] = 'Upgrade ran successfully.'
         ret['result'] = True
 
     return ret

salt/states/supervisord.py

@@ -332,6 +332,7 @@ def dead(name,
                 bin_env=bin_env
             )}
             ret.update(_check_error(result, comment))
+            ret['changes'][name] = comment
             log.debug(six.text_type(result))
     return ret