Phil Spiby - 2019-06-06

A number of the Catalogue templates use English constraints instead of the agreed OCL2.
Many of these are relatively easy to re-specify as OCL2.