Add janus.
Add solr.
Remove solr submodule.
Switch solr modules.
Merge and resolve.
Script to install solr.