Merged revisions 1509704 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1509704 | sergeyb | 2013-08-02 14:39:43 +0100 (Fri, 02 Aug 2013) | 13 lines
  
  Merged revisions 1509700,1509702 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1509700 | sergeyb | 2013-08-02 14:33:48 +0100 (Fri, 02 Aug 2013) | 1 line
    
    Trying to load Crypto with URI or File if other attempts fail
  ........
    r1509702 | sergeyb | 2013-08-02 14:38:11 +0100 (Fri, 02 Aug 2013) | 1 line
    
    Moving a try block a bit higher
  ........
................


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