HM/JPM: supporting -X options (other than just -Xmx)
Merge commit 'ff62ba3eba38b23fb004fd4457fa43c77232bf29'