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

........
  r1547868 | ay | 2013-12-04 19:17:57 +0100 (Wed, 04 Dec 2013) | 10 lines

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

  ........
    r1547865 | ay | 2013-12-04 19:15:15 +0100 (Wed, 04 Dec 2013) | 2 lines

    fix file prop

  ........

........

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