Fix root.war test
Merge branch 'daley', remote-tracking branch 'origin'