Update OU Qtype pmatch for simplified forms #6675

Hi tim,

re did the commit. Updated the version details. Checked with Phil how to handle synonyms on pmatch and pmatchjme. They're staying separate from answer options. Reverted the changes.