Fix the remaining issues

This fixes the imports plus some timeouts waiting for nova baremetal.

Change-Id: I4dc7aad55a05068081ab0b5a12da7c57d3a032f4
Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>