Merge conflict

Author: arthurbarr

.travis.yml

@@ -20,5 +20,6 @@ install:
   - echo nothing
 
 script:
+ - make deps
  - make build-devserver
  - make test-devserver

install-mq.sh

@@ -77,7 +77,7 @@ $RHEL && yum -y install \
 
 # Download and extract the MQ installation files
 DIR_EXTRACT=/tmp/mq
-mkdir -p ${DIR_EXTRACT} 
+mkdir -p ${DIR_EXTRACT}
 cd ${DIR_EXTRACT}
 curl -LO $MQ_URL
 tar -zxvf ./*.tar.gz