Merge pull request #777 from malconis/tomcat-flaky

moved tomcat proxy test to flaky
moved flaky annotation to the right place