Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

Conflicts:
	tools/source/fsys/urlobj.cxx

Change-Id: I59b5b95cf9b65920ec04922fdb25e4228fd22995