Updating cdh4 module to latest merged change.

Change-Id: If9222fc5c60dea7e408c69cc2263e86349875f93
Merge "Updating cdh4 module to latest merged change." into production