Merged revisions 1548471,1548738 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1548471 | ema | 2013-12-06 17:43:39 +0800 (Fri, 06 Dec 2013) | 1 line
  
  [CXF-5437]:JAXBDataBinding can not handle the exception with generic objects like ObjectWithGenerics<Boolean, Integer>
........
  r1548738 | dkulp | 2013-12-07 06:41:00 +0800 (Sat, 07 Dec 2013) | 1 line
  
  Fix test failure
........


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