Branch_2_3: RESTEASY-869, RESTEASY-938

This is my attempt to unravel the disastrous Pull Request #372, which covered RESTEASY-869 and RESTEASY-938 (cloned from RESTEASY-699).  I created Branch_2_3_new from Branch_2_3, reset HEAD to commit 8eb9a, just before commit b4bac, which caused the problem, and reapplied subsequent changes.  There are two changed files for RESTEASY-869, two changed files for RESTEASY-869, some new files in arquillian/RESTEASY-802-AS71, and a test, QueryParamWithMultipleEqualsTest, which disappeared some how.  That should be twelve changed files.  Indeed, when I do 

  git diff /remotes/official/Branch_2_3

from Branch_2_3_new, I get the following changes twelve changes:

diff --git a/arquillian/RESTEASY-802-AS72/pom.xml b/arquillian/RESTEASY-802-AS72/pom.xml
diff --git a/arquillian/RESTEASY-802-AS72/src/main/java/org/jboss/resteasy/resteasy802/JaxRsActivator.java b/arquillian/RESTEASY-802-AS72/src/main/java/org/jboss/resteasy/resteasy802/JaxRsActivator.java
diff --git a/arquillian/RESTEASY-802-AS72/src/main/java/org/jboss/resteasy/resteasy802/TestResource.java b/arquillian/RESTEASY-802-AS72/src/main/java/org/jboss/resteasy/resteasy802/TestResource.java
diff --git a/arquillian/RESTEASY-802-AS72/src/main/java/org/jboss/resteasy/resteasy802/TestResourceImpl.java b/arquillian/RESTEASY-802-AS72/src/main/java/org/jboss/resteasy/resteasy802/TestResourceImpl.java
diff --git a/arquillian/RESTEASY-802-AS72/src/main/java/org/jboss/resteasy/resteasy802/package-info.java b/arquillian/RESTEASY-802-AS72/src/main/java/org/jboss/resteasy/resteasy802/package-info.java
diff --git a/arquillian/RESTEASY-802-AS72/src/test/java/org/jboss/resteasy/resteasy802/GetRestfulTest.java b/arquillian/RESTEASY-802-AS72/src/test/java/org/jboss/resteasy/resteasy802/GetRestfulTest.java
diff --git a/arquillian/RESTEASY-802-AS72/src/test/resources/arquillian.xml b/arquillian/RESTEASY-802-AS72/src/test/resources/arquillian.xml
diff --git a/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/ExternalEntityUnmarshaller.java b/providers/jaxb/src/main/java/org/jboss/resteasy/plugins/providers/jaxb/ExternalEntityUnmarshaller.java
diff --git a/providers/jaxb/src/test/java/org/jboss/resteasy/test/xxe/TestXXESecureProcessing.java b/providers/jaxb/src/test/java/org/jboss/resteasy/test/xxe/TestXXESecureProcessing.java
diff --git a/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java b/resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/delegates/MediaTypeHeaderDelegate.java
diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/InvalidMediaTypeTest.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/InvalidMediaTypeTest.java
diff --git a/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/QueryParamWithMultipleEqualsTest.java b/resteasy-jaxrs/src/test/java/org/jboss/resteasy/test/finegrain/methodparams/QueryParamWithMultipleEqualsTest.java

But for some reason the github diff is also showing changes for files

   * resteasy-bom/pom.xml
   * resteasy-jaxrs/src/main/java/org/jboss/resteasy/core/interception/MessageBodyReaderContextImpl.java
   * resteasy-jaxrs/src/main/java/org/jboss/resteasy/plugins/server/servlet/ConfigurationBootstrap.java

even though these files are the same in  https://github.com/resteasy/Resteasy.  For example,
the diff for resteasy-bom/pom.xml is

            <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>abdera-atom-provider</artifactId>
                 <version>2.3.7.Final</version>              // - deleted
                 <version>${project.version}</version> // + added
             </dependency>

[+ and - at the beginning of the line screws up the formatting]

even though the line

             <version>2.3.7.Final</version

no longer appears in https://github.com/resteasy/Resteasy.

I don't understand.  Maybe it's because I manually applied these changes and committed them to my repo?  Anyway, hopefully, the new Pull Request won't screw up these files.