Signed-off-by: Andor Molnár <andor@cloudera.com> Signed-off-by: Bryan Beaudreault <bbeaudreault@apache.org> Signed-off-by: Ankit Singhal <ankit@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit d5ed8f59e582272c2e3cd9b6b33488fa0f265cbf)