Merge "Fix --memory-limit option to maintenance scripts"