Fix circular imports

We have circular imports disabled by default with the new linting.

Unfortunately these seem to have crept in since we have not yet fixed #146 (closed)

This is messy, and worse; it is simply not supported in all versions of python we support.

Marking this as critical since BuildStream is completely unusable on LTS distros where only 3.4 is available.