Updating cargo and tomcat

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_1_X@1630017 13f79535-47bb-0310-9956-ffa450edef68
Updating Maven WAR plugin

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_1_X@1631708 13f79535-47bb-0310-9956-ffa450edef68
Merge from 1_1_X

git-svn-id: https://svn.apache.org/repos/asf/syncope/branches/1_2_X@1631709 13f79535-47bb-0310-9956-ffa450edef68
Merge from 1_2_X

git-svn-id: https://svn.apache.org/repos/asf/syncope/trunk@1631710 13f79535-47bb-0310-9956-ffa450edef68