IDEX-637 create generic Maven project type instead of splitting by Maven Jar/War Project Type
Merge remote-tracking branch 'origin/master'