InvokerLocator for default EJB Connector being formed incorrectly with IPv6 bind address

When starting the AS with an IPv6 bind address, the following WARN log entry is seen on the console:

17:04:10,765 INFO [SnmpAgentService] SNMP agent going active
17:04:10,783 ERROR [TrapEmitter] SNMP send error for localhost/127.0.0.1:1162: <java.security.InvalidParameterException: Buffer overflow error converting IP address>
17:04:11,030 WARN [InvokerLocator] Host resolves to null in socket://3ffe:ffff:100:f101::1:3873?timeout=300000. Perhaps the host contains an invalid character. See http://www.ietf.org/rfc/rfc2396.txt.
17:04:11,465 WARNING [FileConfigurationParser] AIO wasn't located on this platform, it will fall back to using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO journal

THis is due to the InvokerLocator for the MBean
jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3
being incorrectlly formed by substitution of the bind address into the URL template in the file deploy/ejb3-connection-jboss-beans.xml

socket://${jboss.bind.address}:${port}?timeout=300000

In order to create a well-formed URL, this needs to check for the case when the bind address is an IPv6 literal, and add brackets accordingly.