update the way proxy request url is computed. TODO: fix failing tests
Merge branch '1.7.x' into issue840
Merge branch 'issue845' into 1.7.x
Merge branch '1.7.x' into issue840
fix failing tests and update javadoc
fix failing tests
fix merge conflicts