Merge branch 'upstream/master' into rage-stager-transport

Author: OJ

lib/msf/base/sessions/meterpreter.rb

@@ -307,7 +307,9 @@ def is_valid_session?(timeout=10)
 
     begin
       self.machine_id = self.core.machine_id(timeout)
-      self.payload_uuid ||= self.core.uuid(timeout)
+      # This is causing breakages thanks to Meterpeter not doing what it should
+      # be doing with the uuid.
+      #self.payload_uuid ||= self.core.uuid(timeout)
 
       return true
     rescue ::Rex::Post::Meterpreter::RequestError