more updates for poms and assembly

Conflicts:
	jbpm-designer-distribution-wars/src/main/assembly/assembly-standalone-jboss-as-7_0.xml
	jbpm-designer-distribution-wars/src/main/assembly/assembly-standalone-tomcat-7_0.xml