Fixing path-related tests.
Fixing report test.
Fixing MID-1995 (superfluous xsi:type).
Merge branch 'master' of x:\midpoint