add-jvm-option operation does not work

setup: domain started in domain mode with ./domain.sh

From CLI:
[domain@localhost:9999 /] /host=master/server-config=server-one/jvm=default:add
{
"outcome" => "success",
"result" => undefined,
"server-groups" => undefined
}
[domain@localhost:9999 /] /host=master/server-config=server-one/jvm=default:add-jvm-option(jvm-option="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n")
'jvm-option' is not found among the supported properties: [type]

But when I try to use type:
[domain@localhost:9999 /] /host=master/server-config=server-one/jvm=default:add-jvm-option(type="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n")
{
"outcome" => "failed",
"failure-description" =>

{"host-failure-descriptions" => [("master" => "JBAS014746: jvm-option may not be null")]}

,
"rolled-back" => true
}
[domain@localhost:9999 /]

Solution:
In the class org.jboss.as.controller.descriptions.common.JVMDescriptions.java lines 185-187, replace

node.get(REQUEST_PROPERTIES, TYPE, TYPE).set(ModelType.STRING);
node.get(REQUEST_PROPERTIES, TYPE, DESCRIPTION).set(bundle.getString("jvm.option"));
node.get(REQUEST_PROPERTIES, TYPE, REQUIRED).set(true);

with

node.get(REQUEST_PROPERTIES, JVM_OPTION, TYPE).set(ModelType.STRING);
node.get(REQUEST_PROPERTIES, JVM_OPTION, DESCRIPTION).set(bundle.getString("jvm.option"));
node.get(REQUEST_PROPERTIES, JVM_OPTION, REQUIRED).set(true);

Note: if this helps, assign to me and I will issue a pull request.