[SB-123][fix] fix NPE in TestBlockJoin
[SB-xxx][fix] Change Solr version in build.xml to 5.0-SB-SNAPSHOT
[SB-xxx][fix] Ignore SolrInfoMBeanTest
Merge pull request #1 from AlekseyAleev/trunk-patched

SB-123 and cosmetics