Ovf fix fr bnc #889852

I tried to deal with the indentation change in the best way that I could. Considering that I had announced that this was coming making a change in the indentation was bad timing. Oh well.

There is still some clean up left to do around the integration of ova and ovf, but I though that was out of scope for the bug fix.

The implemented restructuring is pushing the bug fix limits a bit, I know, but at least now the OVF generation is isolated and testable. I could have added all the new stuff to the old structure but we would have ended up with more untestable code, thus I decided to include the restructuring as part of the bug fix.