merged changes from servlet2 branch