More fixes to make the javaagent help string wrap and look right