Add generate_war to jsp_shell payloads
Refactor JSP payloads
Avoid initial spaces on the JSP

So the jsp isn't affected by changes on the framework indentation standards
Use the current msf's naming convention
Move the require to the payloads as ruby and nodejs payloads do
Deprecate modules with date 2013-something

These modules had an expiration date of 2013.
Land #2811 - Add generate_war to jsp_shell payloads
Land #2945, obsolete old modules

Obsoletes:

modules/auxiliary/admin/scada/igss_exec_17.rb
modules/exploits/windows/http/sap_mgmt_con_osexec_payload.rb
modules/post/windows/gather/resolve_hosts.rb
modules/post/windows/manage/persistence.rb
Merge remote-tracking branch 'rapid7/master'
Merge branch 'master' into http-proxy