Ensure that local variable `upload_path` is defined

Merge `upload_payload` and `parse_upload_response` so that the
`upload_path` variable is defined for use in error messages in the event
of failure.

modules/exploits/multi/http/tomcat_mgr_upload.rb

@@ -345,10 +345,7 @@ class Metasploit3 < Msf::Exploit::Remote
     upload_path = normalize_uri(target_uri.path.to_s, "html", "upload")
     vprint_status("#{peer} - Uploading #{war.length} bytes as #{@app_base}.war ...")
     res = send_war_payload(upload_path, war)
-    return parse_upload_response(res)
-  end
 
-  def parse_upload_response(res)
     unless res
       vprint_error("#{peer} - Upload failed on #{upload_path} [No Response]")
       return false