Fix lint problems from merge.

How did that happen, those pieces of code were largely unrelated. Ekkk...

lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py

@@ -93,7 +93,6 @@ def admin_user_info( ):
     return (username, email, password)
 
 
-
 def get_local_tool_shed_url( config_parser ):
     port = '9009'
     if config_parser.has_section( 'server:main' ):

lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py

@@ -12,7 +12,6 @@ sys.path.insert(1, os.path.join( os.path.dirname( __file__ ), os.pardir, os.pard
 import galaxy.webapps.tool_shed.config as tool_shed_config
 from galaxy.web import security
 from galaxy.webapps.tool_shed.model import mapping
-from tool_shed.util import xml_util
 from .bootstrap_util import admin_user_info
 
 log = logging.getLogger( __name__ )