renamed supervisord conf: because supervisord-2 can't use include section
contained solr launcher into puppet modules
contained configuration of solr