Make all cadillac fields required f-me/carma#1133
Merge from master