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

........
  r1490431 | sergeyb | 2013-06-06 21:33:07 +0100 (Thu, 06 Jun 2013) | 1 line
  
  Minor updates to get a demo working
........
  r1491745 | sergeyb | 2013-06-11 12:24:49 +0100 (Tue, 11 Jun 2013) | 1 line
  
  [CXF-5065] Setting subresource parent before the subresource gets evaluated
........


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