PRIS-1147: Corrections to cmock for mock generation.