Rebased OpenKomodo sources