Correct psi for template packages for java; order "first" deleted from scala psi finders descriptions. This fixes problems that can lead to incorrect template resolve for java.
#SCL-6754 fixed
Merge remote-tracking branch 'origin/master'