[Bug 836965] cibadmin -P cannot apply diffs which contain comments