Land #7529, nil.downcase fix for tomcat_mgr_deploy

Don't think it was ever needed, since the password is case-sensitive.

Fixed a minor merge conflict where PASSWORD became HttpPassword.

modules/exploits/multi/http/tomcat_mgr_deploy.rb

@@ -312,7 +312,7 @@ class MetasploitModule < Msf::Exploit::Remote
         origin_type: :service,
         module_fullname: self.fullname,
         private_type: :password,
-        private_data: datastore['HttpPassword'].downcase,
+        private_data: datastore['HttpPassword'],
         username: datastore['HttpUsername']
     }