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

........
  r1467398 | dkulp | 2013-04-12 14:28:46 -0400 (Fri, 12 Apr 2013) | 2 lines

  [CXF-4960] Fix a couple of startup race conditions

........

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