logout ffixes
Merge remote-tracking branch 'upstream/master'
merged
Merge pull request #830 from patriot1burke/master

servlet logout fixes