Merge branch 'release_16.01' into release_16.04

Conflicts:
	.ci/flake8_blacklist.txt
	tox.ini

.ci/flake8_blacklist.txt

@@ -1,5 +1,6 @@
 .venv/
 .tox/
+eggs/
 client/
 database/
 doc/patch.py

lib/tool_shed/galaxy_install/tool_dependencies/recipe/tag_handler.py

@@ -418,9 +418,9 @@ class Repository( RecipeTag, SyncDatabase ):
                                                                                                         dependent_install_dir,
                                                                                                         tool_dependency_type='package' )
                     if not can_install_tool_dependency:
-                        log.debug( "Tool dependency %s version %s cannot be installed (it was probably previously installed), " %
-                            ( str( tool_dependency.name, str( tool_dependency.version ) ) ) )
-                        log.debug( "so appending it to the list of handled tool dependencies." )
+                        log.debug( "Tool dependency %s version %s cannot be installed (it was probably previously installed), "
+                                   "so appending it to the list of handled tool dependencies.",
+                                   str( tool_dependency.name), str( tool_dependency.version ) )
                         handled_tool_dependencies.append( tool_dependency )
             else:
                 can_install_tool_dependency = True

tox.ini

@@ -6,12 +6,12 @@ skipsdist = True
 [testenv:py27-lint]
 commands = bash .ci/flake8_wrapper.sh
 whitelist_externals = bash
-deps = flake8
+deps = flake8==3.0.4
 
 [testenv:py34-lint]
 commands = bash .ci/flake8_py3_wrapper.sh
 whitelist_externals = bash
-deps = flake8
+deps = flake8==3.0.4
 
 
 [testenv:py27-unit]