url config property for Salesforce being dropped from -ds.xml creation during deployment from JBDS 5.0

The URL specified in the Salesforce connection profile in JBDS is not being written to the datasource when it is created from a JBDS action (either through preview functionality or Model->Create Datasource).

Data sources created from Teiid Designer perspective do not include the SFDC URL input by the user. In some cases this results in the user being unable to authenticate and run queries against the datasource (preview or standard VDB queries) if their user id does not authenticate against the default login.salesforce.com site URLs. Need to correct the datasource creation behavior to push down the URL into the datasource as well.

When creating the datasource using the Modelling->Create Data Source with the "Use Model Connection Info", the end result is the sfdcTest-ds.xml below:

<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<connection-factories>
<no-tx-connection-factory>
<jndi-name>sfdcTest</jndi-name>
<rar-name>teiid-connector-salesforce.rar</rar-name>
<use-java-context>true</use-java-context>
<connection-definition>javax.resource.cci.ConnectionFactory</connection-definition>
<jmx-invoker-name>jboss:service=invoker,type=jrmp</jmx-invoker-name>
<min-pool-size>0</min-pool-size>
<max-pool-size>10</max-pool-size>
<blocking-timeout-millis>3000</blocking-timeout-millis>
<idle-timeout-minutes>30</idle-timeout-minutes>
<prefill>false</prefill>
<background-validation>false</background-validation>
<background-validation-millis>0</background-validation-millis>
<validate-on-match>true</validate-on-match>
<use-fast-fail>false</use-fast-fail>
<statistics-formatter>org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</statistics-formatter>
<isSameRM-override-value>false</isSameRM-override-value>
<allocation-retry>0</allocation-retry>
<allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
<config-property type="java.lang.String" name="password">blahblahblah</config-property>
<config-property type="java.lang.String" name="template-name">connector-salesforce</config-property>
<config-property type="java.lang.String" name="username">mshirley.dev@redhat.com</config-property>
</no-tx-connection-factory>
</connection-factories>

We should see an additional property of the URL (probably should look like the below example) stating the URL value from the model.
<config-property type="java.lang.String" name="url">https://login.salesforce.com/services/Soap/u/25.0</config-property>

Same behavior occurs when creating a data source using the connection profile option instead of the model connection info.