Fix up payload cache sizes, and powershell include

Author: OJ

modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb

@@ -4,6 +4,7 @@
 ##
 
 require 'msf/core'
+require 'msf/core/handler/reverse_tcp'
 require 'msf/base/sessions/powershell'
 
 module Metasploit3

modules/payloads/stagers/windows/x64/reverse_winhttps.rb

@@ -9,7 +9,7 @@
 
 module Metasploit4
 
-  CachedSize = 347
+  CachedSize = 537
 
   include Msf::Payload::Stager
   include Msf::Payload::Windows

spec/modules/payloads_spec.rb

@@ -3590,6 +3590,28 @@
                           reference_name: 'windows/x64/meterpreter/reverse_tcp'
   end
 
+  context 'windows/x64/meterpreter/reverse_winhttp' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                              'stagers/windows/x64/reverse_winhttp',
+                              'stages/windows/x64/meterpreter'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'windows/x64/meterpreter/reverse_winhttp'
+  end
+
+  context 'windows/x64/meterpreter/reverse_winhttps' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                              'stagers/windows/x64/reverse_winhttps',
+                              'stages/windows/x64/meterpreter'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'windows/x64/meterpreter/reverse_winhttps'
+  end
+
   context 'windows/x64/meterpreter_bind_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [