Fix MPS-19687 Import of Mps class in Java class breaks after any editing of Mps class.
Merge branch 'MPS3.0' into 3.1/danya/fixes