Applying patch for bug OOZIE-674