Revert unnecessary import reordering due to rebasing after the dotcloud -> docker rename