Modify retry mechanism to specify all skipped nodes pending OOZIE-1879

and an update to CDH5