OOZIE-1907 DB upgrade from 3.3.0 to trunk fails on derby (rkanter)
OOZIE-1890 Make oozie-site empty and reconcile defaults between oozie-default and the code