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

........
  r1468837 | sergeyb | 2013-04-17 12:14:07 +0100 (Wed, 17 Apr 2013) | 1 line
  
  [CXF-4971] Updating JSONProvider to check a context property too when deciding whether to keep the root or not
........
  r1468839 | sergeyb | 2013-04-17 12:14:43 +0100 (Wed, 17 Apr 2013) | 1 line
  
  [CXF-4971] The system test
........


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