SpringFacetType.getInstance() -> SpringFacet.getSpringFacetType()
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'