fix(rest) patched code from previous commit to make rest tests for tomcat work
fix(engine) CAM-2124 add update incident to mybatis configuration