Rev zanata branch to 1.12.X
Merge pull request #962 from candlepin/alikins/rev_zanata

Rev zanata branch to 1.12.X