Import fixes for the structural object module rearrangements.
Authored by: bugman 2013-03-24
Parent: [r19124]
Child: [r19126]