Merge branch 'master', remote-tracking branch 'upstream/master'
Added support for injecting cookies into requests from pre-interceptors.
Added support for Cosign proxy authentication via pre-interceptor.
Merge branch 'master' of https://github.com/rnicoll/WebproxyPortlet