[#2344] Backporting some deprecated features which were not reflected yet
[#2344] Adding missing link to trusted_proxies
Merge branch '2.0' into 2.1
Merge remote-tracking branch 'origin/2.1' into 2.1
[#2345] Minor tweaks to target path