WIP - changes to fix non-drop cookie. Got to point where servlet called but req/map is wrong.

Change-Id: I07302c40ede799fd5e04e92a19c57d88dd156815