Fixing WSAS-1744 and tomcat annotation processing fixes