Attempt to fix resetexpress build on Travis

The restexpress-mysql-raw test is failing with exceptions that look like
it's unable to connect to the mongodb database.  I didn't dive into the
implementation, but I'm guessing that it always connects to both
databases, but that depending on which setup file it's started with, it
only declares its dependency on one of the databases, and so the other
database isn't guaranteed to be available.  This change has it declare a
dependency on both databases always.

frameworks/Java/restexpress/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "restexpress",
   "tests": [{
     "default": {
-      "setup_file": "setup_mongodb",
+      "setup_file": "setup",
       "json_url": "/restexpress/json",
       "plaintext_url": "/restexpress/plaintext",
       "db_url": "/restexpress/mongodb",
@@ -24,7 +24,7 @@
       "versus": "netty"
     },
     "mysql-raw": {
-      "setup_file": "setup_mysql",
+      "setup_file": "setup",
       "db_url": "/restexpress/mysql",
       "query_url": "/restexpress/mysql?queries=",
       "port": 8080,

frameworks/Java/restexpress/setup.sh

@@ -3,7 +3,7 @@
 sed -i 's|mongodb://.*/hello_world|mongodb://'"${DBHOST}"'/hello_world|g' config/dev/environment.properties
 sed -i 's|mysql://.*:3306|mysql://'"${DBHOST}"':3306|g' config/dev/environment.properties
 
-fw_depends java maven
+fw_depends java maven mysql mongodb
 
 mvn clean package
 mvn assembly:single

frameworks/Java/restexpress/setup_mongodb.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends mongodb
-
-source ./setup.sh

frameworks/Java/restexpress/setup_mysql.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql
-
-source ./setup.sh