Fix grammar in wcf.comment.error.floodControl
Merge branch '2.0'