Fix: system servlet for Solr 4.4 and above
Fix: composer for wanadev
Merge branch 'solr-4-4-above'