Revert "Remove hadoop world hacks. These have moved to the 20141015-hadoop_world branch."

This reverts commit 8aa8d73b57e39382650f050f7932950460d60836.