OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang)