Code cleanup
 - simplify ResourceRequest
 - rename RequestContext methods to conform
 - caveat: refactoring broke Drools templates
Fixing test errors