Merged revisions 1517661 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1517661 | dkulp | 2013-08-26 15:55:13 -0400 (Mon, 26 Aug 2013) | 2 lines

  Update the order of some of the elements to match the actual schema so the eclipse web.xml validator is happy

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1517677 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions 1517662 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1517662 | dkulp | 2013-08-26 15:55:19 -0400 (Mon, 26 Aug 2013) | 2 lines

  Add frontEnd flag to enable errorless import into eclipse with java6/7 mix

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1517678 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions 1517663 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1517663 | dkulp | 2013-08-26 15:55:23 -0400 (Mon, 26 Aug 2013) | 2 lines

  Fix ut demo to also work with ws-discovery

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1517679 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions 1517675 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1517675 | dkulp | 2013-08-26 16:08:40 -0400 (Mon, 26 Aug 2013) | 2 lines

  More updates to allow co-existence with ws-discovery

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1517680 13f79535-47bb-0310-9956-ffa450edef68
Recording revisions 1517661,1517662,1517663,1517675 via  git from
https://svn.apache.org/repos/asf/cxf/trunk



git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1517681 13f79535-47bb-0310-9956-ffa450edef68