jboss-app_7_0.xsd imports jboss-common_6_0.xsd and application_6.xsd

The following xml code in eclipse fails the validate:

<?xml version="1.1" encoding="UTF-8"?>

<jboss-app version="7.0" xmlns="http://www.jboss.com/xml/ns/javaee"
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xmlns:jee="http://www.jboss.com/xml/ns/javaee"
	xsi:schemaLocation="
      http://www.jboss.com/xml/ns/javaee
      http://www.jboss.org/schema/jbossas/jboss-app_7_0.xsd">
      <description>test</description>
</jboss-app>

The error is: cvc-complex-type.3.1: Value '7.0' of attribute 'version' of element 'jboss-app' is not valid with respect to
the corresponding attribute use. Attribute 'version' has a fixed value of '6'.

This is clearly caused by the intermingling of jee 7 with jee6 in the schemas. These schemas need to be cleaned up or our users will be experiencing errors all the time.