Merge branch 'release_16.07' into dev

.ci/first_startup.sh

@@ -1,15 +1,16 @@
-#!/bin/bash
+#!/bin/sh
 TRIES=120
 URL=http://localhost:8080
+EXIT_CODE=1
+i=0
 echo "Testing for correct startup:"
 bash run.sh --daemon && \
-while [[ $i -le $TRIES ]]
-do
-    curl "$URL" && EXIT_CODE=0 && break
-    sleep 1
-    EXIT_CODE=1
-    ((i = i + 1))
-done
+    while [ "$i" -le $TRIES ]; do
+        curl "$URL" && EXIT_CODE=0 && break
+        sleep 1
+        i=$((i + 1))
+    done
+kill -9 "$(cat paster.pid)"
 echo "exit code:$EXIT_CODE, showing startup log:"
 cat paster.log
 exit $EXIT_CODE

config/galaxy.ini.sample

@@ -183,9 +183,9 @@ paste.app_factory = galaxy.web.buildapp:app_factory
 # for more information on these options.
 #dependency_resolvers_config_file = config/dependency_resolvers_conf.xml
 
-# Following Conda dependency resolution options will change the defaults for each Conda resolver,
-# but multiple resolvers can be configured independently and these options overridden in
-# dependency_resolvers_config_file.
+# The following Conda dependency resolution options will change the defaults for
+# all Conda resolvers, but multiple resolvers can be configured independently
+# in dependency_resolvers_config_file and these options overridden.
 # Location on the filesystem where Conda packages are installed
 #conda_prefix = <tool_dependency_dir>/_conda
 # Override the Conda executable to use, it will default to the one on the