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

................
  r1530360 | sergeyb | 2013-10-08 18:18:08 +0100 (Tue, 08 Oct 2013) | 9 lines
  
  Merged revisions 1530350 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1530350 | sergeyb | 2013-10-08 18:03:09 +0100 (Tue, 08 Oct 2013) | 1 line
    
    [CXF-5319] Minor simplification to WADLGenerator when JSON is requested
  ........
................


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