Structural type reverted (for java 6 compatibility)
(cherry picked from commit 0cde647)
Different macro printers for 2.10/2.11 + one default; proper range processing for psi with preceding comments
(cherry picked from commit ea5a95e)
missing due to IDEA buf files
(cherry picked from commit ebe4fb0)