assemble the webapp in place... no need for an intermediary directory... don't use one for making jar files, intermediary is only used for generated sources

Conflicts:

	war/pom.xml

This reverts commit a859d2e9.
I pushed relevant jars yesterday but doesn't look like they hit central
yet.

session cookie name.

Integrating a newer version of libaries that have the correct license
header in POM and source code.