More PHJ fixes.

Change-Id: I1330da5ff65f1b69a7db1532c102f2af885f1a3a
Reviewed-on: http://gerrit.sjc.cloudera.com:8080/3946
Reviewed-by: Nong Li <nong@cloudera.com>
Tested-by: jenkins