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

........
  r1478513 | owulff | 2013-05-02 16:17:40 -0400 (Thu, 02 May 2013) | 2 lines

  [CXF-4854] Load the STS war on startup

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1478845 13f79535-47bb-0310-9956-ffa450edef68
Recording revisions 1476165,1477561,1478513 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@1478846 13f79535-47bb-0310-9956-ffa450edef68
Blocking revisions 1475978,1475979,1477686,1478057,1478196,1478342,1478348,1478579 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@1478847 13f79535-47bb-0310-9956-ffa450edef68