Fix/1.1.x/soc 2654

Updated gatein wci version to 2.1.0-GA and use wci-tomcat6 instead of wci-tomcat