Adapt parameters that moved to instance variables
Adapt parameters that moved to instance variables

Due to a change in the code organization in stable-2.9, some
method variables became instance variables, causing a semantic
merge conflict. Fix this.

Signed-off-by: Klaus Aehlig <4ce51de36d9068cd7db2eec1151e0f3f95419008@google.com>
Reviewed-by: Helga Velroyen <2d0126b1ec6f9ec5cbec4a7012aa14faeaef10f5@google.com>

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