OOZIE-1577: Fix compilation failure of merge