Merge "(bug 39099) Changed error-levels in Uri.php"