Lots of import cleanups including removal of '*' imports, missing imports, and unused imports.
Authored by: bugman 2013-06-16
Parent: [r20160]
Child: [r20162]