Fix issue with x-target-uri handling. It shall be removed all the time when...

Fix issue with x-target-uri handling. It shall be removed all the time when resolved, unless for fallback route, which is by definition not something used when a target uri is resolved.
10 jobs for master in 29 minutes and 52 seconds (queued for 3 minutes and 2 seconds)
Status Job ID Name Coverage
  Build
passed #35181
docker-centos7
job-centos7-makefile-clang

00:01:30

passed #35182
docker-debian8
job-debian8-ninja-clang

00:02:21

passed #35183
docker-debian9
job-debian9-ninja-clang

00:01:44

passed #35184
docker-ubuntu-rolling
job-ubuntu-rolling-ninja-clang

00:01:39

 
  Package
passed #35185
docker-centos7
job-centos7-rpm

00:06:52

passed #35186
docker-debian8
job-debian8-deb

00:07:43

passed #35187
docker-debian9
job-debian9-deb

00:07:56

 
  Deploy
passed #35188
deploy
job-centos7-rpm-deploy

00:00:32

passed #35189
deploy
job-debian8-deb-deploy

00:07:07

passed #35190
deploy
job-debian9-deb-deploy

00:04:05