merge submodule change: cdh: fix templates causing warnings

https://gerrit.wikimedia.org/r/#/c/180124/

Change-Id: Iffd55a0cf4937338be6353a0dcfaf3705239ab9a