Core queue creation is missing a routing type attribute

deploying a queue and jms queue that map to the same address like bellow:
<queue name="jms.queue.SSOQueue" address="jms.queue.SSOQueue" durable="true"/>
<jms-queue name="SSOQueue" entries="/queue/SSOQueue java:jboss/exported/jms/queue/SSOQueue"/>

Throws the following error:

AMQ222275: Failed to deploy queue jms.queue.SSOQueue: Can't update queue jms.queue.SSOQueue with routing type: MULTICAST, Supported routing types for address: jms.queue.SSOQueue are [ANYCAST]

This is due to Artemis 2.6.x upgrade