Update to CSP 0.9.36-jboss1