Fix a few adjective/noun gender+count disagreement mistakes.
Authored by: david_costanzo 2019-02-18
Parent: [r4787]
Child: [r4789]