Zanata changes for 0.5.0.CRx