Change-Id: Ie5c6e26e2acae543cf8b17f17e18b09b7a07adf4
Reviewed-on: http://gerrit.ent.cloudera.com:8080/2484


Reviewed-by: Nong Li <nong@cloudera.com>
Tested-by: Henry Robinson <henry@cloudera.com>
(cherry picked from commit 96eb8365)
Reviewed-on: http://gerrit.ent.cloudera.com:8080/2490


Reviewed-by: Henry Robinson <henry@cloudera.com>