include the os_type in the log message when it's invalid

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Clean up tests that were importing teuthology modules as teuthology to avoid confusion

Signed-off-by: Andrew Schoen <aschoen@redhat.com>