Clean up imports inside the avocado code tree. This
does not bring any functional changes to avocado.
Signed-off-by: NLucas Meneghel Rodrigues <lmr@redhat.com>