Zanata changes for 6.2.0.CR1