Merge "Fix execute status of cleanup script files"