Merge "Remove comment line in generated passwd file"