minor circular import problem fixed to make test geni server work again.
minor circular import problem fixed to make test geni server work again.


sburnett/seattle,sburnett/seattle,sburnett/seattle,sburnett/seattle,sburnett/seattle,sburnett/seattle