fix java payload struts module
Fix cosmetic issue

Fix cosmetic issue /w email address when it is output via 'info' or the Rapid7 module page.
Land #3350, author fix for wlan_geolocate
Land #3347, @FireFart's change to allow configurable landing dir on struts_code_exec_parameters
Merge remote-tracking branch 'rapid7/master'
Merge branch 'master' into http-proxy