Fixes for a bad update and merger from upstream.
Some imports were lost in the specific_analyses.relax_disp.model module.
Authored by: bugman 2014-08-21
Parent: [r25147]
Child: [r25149]
