idea.java.redist not null.
Merge remote-tracking branch 'origin/master'
IDEA-131989 (lib upgraded)
Supported "initializer block" arrangement entry (IDEA-95115)

Previous behaviour was to treat initializer block as field and stick it with previous field, now it's eliminated with matching and rearranging according to matching rules. See comments also in [CR-IC-6618]
Added option "Blank lines | Around initializer" to "Code Style Settings | Java | Blank Lines" panel
fixed failing test "testWrapMethodAnnotationBeforeParams"

Added possibility to specify parent block for AbstractJavaBlock. When processing method, wrap after annotation (on keyword "public, private, protected") is set to be parent of method parameters wrap. So when wrap occurs parent wrap is used instead of method parameter wrap (which is now child)
IDEA-131863 Plugin.xml extension documentation: show EP definition in addition to javadoc