Merge "Add PSI for lint from IJ 15 to IJ 16.1.1"