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

........
  r1559220 | dkulp | 2014-01-17 13:53:56 -0500 (Fri, 17 Jan 2014) | 2 lines

  [CXF-5491] If the ws-discovery service fails to startup as part of th a normal listener process, log the warning and continue so the real services won't block.

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1559222 13f79535-47bb-0310-9956-ffa450edef68
Recording revisions 1559220 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@1559223 13f79535-47bb-0310-9956-ffa450edef68