Fix a merge issue in 3c296f56
Fix a merge issue in 3c296f56

Lines removed in devel-2.7 (250a9404) weren't removed in the merge with
master.

Signed-off-by: Bernardo Dal Seno <dcdd79c5479cb9d1329ec01d126f02cb045aa103@google.com>
Reviewed-by: Iustin Pop <acf83a5274f31a43af6b914614365999469c1a31@google.com>

ganeti/ganeti,apyrgio/ganeti,onponomarev/ganeti,mbakke/ganeti,apyrgio/ganeti,dimara/ganeti,andir/ganeti,leshchevds/ganeti,grnet/snf-ganeti,bitemyapp/ganeti,bitemyapp/ganeti,leshchevds/ganeti,apyrgio/snf-ganeti,ganeti-github-testing/ganeti-test-1,ganeti/ganeti,mbakke/ganeti,yiannist/ganeti,onponomarev/ganeti,leshchevds/ganeti,yiannist/ganeti,andir/ganeti,apyrgio/snf-ganeti,ganeti-github-testing/ganeti-test-1,dimara/ganeti,andir/ganeti,yiannist/ganeti,ganeti/ganeti,mbakke/ganeti,grnet/snf-ganeti