fix problems with proxy handling. Change method name to a  meaningful one
Merge pull request #3997 from spigad/proxy

fix problems with proxy handling. Change method name to a  meaningful on...
fix typo
Delete block white/black lists. CAF-276
Merge pull request #3998 from mmascher/consistent-CAF-276

Delete block white/black lists. CAF-276