Merge "Add a define guard to NoLocalSettings.php"