More import fixes for the new package layout.
Authored by: bugman 2013-03-27
Parent: [r19258]
Child: [r19260]