Fix formatting
Merge branch 'master' into solr_and_hadoop_integration
Fix formatting.