WW-4070 Cleans up assemblies and removes unused assembly definition

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