Merge "Make maintenance scripts fail on unknown parameters"