8136930: Simplify use of module-system options by custom launchersReviewed-by: coleenp, lfoltan, mchung