Fix unit tests to work with WarApp.py options when update_cookie_on_page_load: True
Merge remote-tracking branch 'origin/dev' into dev