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

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1467398 13f79535-47bb-0310-9956-ffa450edef68