adding 'security-constraint' element to merge web.xml tests to make sure it gets included
updating cargo, flex plugins
Merge commit '3c126a1'