fix typo
Merge branch 'cdh5.2'