Remove empty/renamed sections in tool_conf.xml.main
Fix for server error caused by unicode substitution in url_for.
Fix for situation where duplicate database records would be created if a repository was uninstalled and reinstalled after getting updates from the tool shed.
Merge stable.