AMQ119209: Can't remove routing type MULTICAST, queues exists for address: jms.queue.xxxxxx

Issue

I am trying to upgrade to EAP 7.2, I follow directions to extract the new release, however I keep getting this error for JMS queues

11:31:00,069 ERROR [org.jboss.msc.service.fail] (ServerService Thread Pool -- 122) MSC000001: Failed to start service jboss.messaging-activemq.default.jms.queue.xxxxx: org.jboss.msc.service.StartException in service jboss.messaging-activemq.default.jms.queue.xxxxx: WFLYMSGAMQ0028: Failed to create JMS Queue
    at org.wildfly.extension.messaging.activemq.jms.JMSQueueService$1.run(JMSQueueService.java:82) [wildfly-messaging-activemq-7.2.0.GA-redhat-00005.jar:7.2.0.GA-redhat-00005]
    at org.jboss.threads.ContextClassLoaderSavingRunnable.run(ContextClassLoaderSavingRunnable.java:35) [jboss-threads-2.3.2.Final-redhat-1.jar:2.3.2.Final-redhat-1]
    at org.jboss.threads.EnhancedQueueExecutor.safeRun(EnhancedQueueExecutor.java:1985) [jboss-threads-2.3.2.Final-redhat-1.jar:2.3.2.Final-redhat-1]
    at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.doRunTask(EnhancedQueueExecutor.java:1487) [jboss-threads-2.3.2.Final-redhat-1.jar:2.3.2.Final-redhat-1]
    at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1349) [jboss-threads-2.3.2.Final-redhat-1.jar:2.3.2.Final-redhat-1]
    at java.lang.Thread.run(Thread.java:748) [rt.jar:1.8.0_192]
    at org.jboss.threads.JBossThread.run(JBossThread.java:485) [jboss-threads-2.3.2.Final-redhat-1.jar:2.3.2.Final-redhat-1]
Caused by: java.lang.IllegalStateException: AMQ119209: Can't remove routing type MULTICAST, queues exists for address: jms.queue.xxxxx. Please delete queues before removing this routing type.