Merged fix from trunk:
Fixed the file locations to work for the gramps40/trunk layout.
Also porting my fix from gramps34 branch for
6837: runtest.sh runs some reports that no longer exist
git-svn-id: svn+ssh://svn.code.sf.net/p/gramps/code/trunk@22684 4ae1f11a-8b86-4847-b8af-ab372f36d1fd
svn: r22686