Merged revisions 1450460 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1450460 | coheigea | 2013-02-26 13:52:38 -0800 (Tue, 26 Feb 2013) | 10 lines

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

  ........
    r1450456 | coheigea | 2013-02-26 13:45:25 -0800 (Tue, 26 Feb 2013) | 2 lines

    Using updated keystore file property in a few places

  ........

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes@1450466 13f79535-47bb-0310-9956-ffa450edef68
Recording revisions 1450460 via  git from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes



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