Fix always FULLY COVERED#4

Open

benjaminfuchs wants to merge 4 commits intocitrix-openstack:masterfrom

benjaminfuchs:master

Commits on Nov 13, 2016

Fix always FULLY COVERED
benjaminfuchs
committed

Commits on Nov 14, 2016

New try
benjaminfuchs
committed

Commits on Nov 15, 2016

Fix + unlink files
benjaminfuchs
committed

Commits on Nov 18, 2016

Fixing coverage of includes.
benjaminfuchs
committed