MPS-20228 Two 'src' folders are created on creating new java project with mps plugin
Merge remote-tracking branch 'origin/MPS3.1'