Some more fixes to make the Relax_disp.test_read_r2eff system test pass.
These are again changes needed due to the trunk now being very different.
Authored by: bugman 2013-03-27
Parent: [r19260]
Child: [r19262]
