OOZIE-1933 appendix - SLA unit tests fix
OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang)
OOZIE-1925 upgrade tomcat to 6.0.41 (rkanter via shwethags)