Fixes Issue 202

(cherry picked from commit ad469eb6ea77b34a188677dee9c358615543cdf6)

Conflicts:
	containers/tomcat-7/.classpath
	sip-servlets-test-suite/.classpath