Many fixes for oVirt 3.1.0