Merge "Remove unneeded spaces inside html in NoLocalSettings.php"