8136930: Simplify use of module-system options by custom launchers
Reviewed-by: alanb, ksrini, henryjen, sundar

8134111: Unmarshaller unmarshalls XML element which doesn't have the expected namespace
Reviewed-by: lancea