Merge pull request #815 from jmaas/master

Undo removed import (item)
Merge pull request #816 from jmaas/master

More pyflakes  related changes
Merge pull request #817 from jmaas/master

Removed legacy test_basic file
Merge pull request #818 from jmaas/master

Removed redundant entry from cobbler.spec