Merge branch 'issue622' into 1.6.x
add one more (unrelated) test
fix failing unit test
update commons-io version & add one more test
strip jsessionID properly
Merge branch 'issue638' into 2.0.x