Rearranged war to move test stuff out of main app project. Tests passing.
Adding server.xml out of tomcat 7.0.42  source. Committing for baseline.
Tomcat reconfig and server.xml move. Now seems to be working as expected.
Now working with custom context.
Simplified project structure so there is only one root--rolled in the UA tests.