Merged revisions 1563197-1563198 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1563197 | sergeyb | 2014-01-31 18:18:17 +0000 (Fri, 31 Jan 2014) | 1 line
  
  [CXF-5348] Fix to get complex typed mappers correctly selected
........
  r1563198 | sergeyb | 2014-01-31 18:24:34 +0000 (Fri, 31 Jan 2014) | 1 line
  
  [CXF-5348] Preventing NPE
........


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