Merge mpdl

rebase against your branch.
Overwrite pom.xml and SolrIndexer.java with my version to resolve conflict. 
Please let me know if it is the right way to submit work.