Merge "normalize filenames of maintenance scripts"