Reworked imports.

Prevents loaded modules printing doc info.
Fixed portage_config state to allow a return of True

portage_config state was always returning None when Test=True.
Merge pull request #6073 from shadowfax-chc/portage_config_cleanup

Portage config cleanup