Revision 1371142

LUCENE-3312: Merged revision(s) 1366639-1371131 from lucene/dev/trunk:

SOLR-3259: default /get to json
........
minor tweaks to update script example
........
LUCENE-4268: Rename ResourceAsStreamReasourceLoader to ClasspathResourceLoader, provide FilesystemResourceLoader, bug fixing
........
LUCENE-4268: Fix test bug
........
SOLR-3648: Fix Velocity template loading in SolrCloud mode
........
fix confusing IW infoStream message
........
Fix rawtypes warning in java 7 and 8, make the SuppressWarnings more local
........
Nicer solution to generic array creation (still problematic in Java 6, but correct in Java 7 if done this way)
........
Disable test failing with Java 8
........
Allow detecting of Java 8
........
LUCENE-4109: BooleanQueries are not parsed correctly with the flexible queryparser
........
LUCENE-4269: remove BalancedSegmentMergePolicy (use TieredMergePolicy instead)
........
LUCENE-4269: deprecate BalancedSegmentMergePolicy (use TieredMergePolicy instead)
........
LUCENE-4190: restrict allowed filenames to reduce risk of deleting non-lucene file from the index directory
........
fix the monkey: connection loss and expiration cause NPE
........
upgrade checkJavaDocs.py to python3
........
LUCENE-3884: Move ElisionFilter out of .fr package
........
fix encoding in javadocs checker
........
LUCENE-2501: fix thread hazard when threads add same field with different IndexOptions at the same time
........