Update Marmotta to the 3.3.0 release candidate

* Update Marmotta to the 3.3.0 release candidate
* Use new style jettywrapper configuration (as suggested by Justin Coyne)