[galaxy-dev] [hg] galaxy 2685: Add tool_conf.xml.main that was removed