Fix #4430 - Add support for -o to save the payload to disk

Fix #4430
No point to save if there's no payload
Well, should be -1
Land #4437, msfvenoms new output switch
Merge remote-tracking branch 'upstream/master'