Fix java payload generation

jsp payloads are java but do not generate JARs
also we were not merging datastore options in properly
fix specs from change

spec changes to go with the previous code change
Land #3118, fix java payloads for msfvenom