Changing schema back to all text_general. Few minor changes to service config classes and solrdao.