Fixes for the lib.software.grace for an imperfect merger of the relax_disp branch.
Authored by: bugman 2013-11-27
Parent: [r21663]
Child: [r21665]
