Merge branch 'dev' into release

Author: mdesiderio

service/run-config/dev/build/Dockerfile

@@ -14,6 +14,6 @@ COPY sumo-sources.json /data/sumo-sources.json
 
 COPY sumo.conf /etc/sumo.conf
 
-CMD /bin/bash /usr/local/share/sumocollector/collector start && java -Dnewrelic.environment=development -javaagent:$NEWRELIC_JAR -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar /data/supply-server.jar server /data/supply-server.yaml
+CMD /bin/bash /usr/local/share/sumocollector/collector start && java -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar /data/supply-server.jar server /data/supply-server.yaml
 
 EXPOSE 8080 8081

service/run-config/dev/src/main/resources/supply-server.yaml

@@ -146,7 +146,7 @@ logging:
       timeZone: UTC
       logFormat:  "%-5level [%d{yyyy-dd-mm HH:mm:ss.SSS}] [%thread] %logger - %msg%n"
 
-authScheme: v3
+authScheme: v2
 
 # File service domain
 fileServiceDomain: api.topcoder-dev.com

service/run-config/qa/build/Dockerfile

@@ -14,6 +14,6 @@ COPY sumo-sources.json /data/sumo-sources.json
 
 COPY sumo.conf /etc/sumo.conf
 
-CMD /bin/bash /usr/local/share/sumocollector/collector start && java -Dnewrelic.environment=test -javaagent:$NEWRELIC_JAR -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar /data/supply-server.jar server /data/supply-server.yaml
+CMD /bin/bash /usr/local/share/sumocollector/collector start && java -Ddw.databases[0].password="$OLTP_PW" -Ddw.databases[1].password="$DW_PW" -jar /data/supply-server.jar server /data/supply-server.yaml
 
 EXPOSE 8080 8081

service/src/main/resources/sql/score/get-challenge-results.sql

@@ -1,7 +1,7 @@
  select
 s.placement placement,
 s.final_score finalScore,
-rev_r.user_id userId,
+us.user_id userId,
 sub_r.resource_id submitterResourceId,
 rev_r.resource_id reviewerResourceId,
 us.handle handle,

service/src/test/resources/expected-sql/score/get-challenge-results.sql

@@ -1,7 +1,7 @@
  select
 s.placement placement,
 s.final_score finalScore,
-rev_r.user_id userId,
+us.user_id userId,
 sub_r.resource_id submitterResourceId,
 rev_r.resource_id reviewerResourceId,
 us.handle handle,