(cherry picked from commit f7a7a9dd)
Conflicts:
	sal/qa/rtl/strings/test_strings_replace.cxx
	sal/rtl/ustring.cxx

Change-Id: I745b09d8a248f08afdd3387f4cfcf69d71ec3c39