Merge remote-tracking branch 'upstream/master' into misc/docker-build

# Conflicts:
#	Dockerfile

services/git-bridge/Dockerfile

@@ -1,18 +1,9 @@
 # Dockerfile for git-bridge
 
+FROM maven:3-jdk-8
 
-FROM ubuntu:latest
+RUN apt-get update && apt-get install -y make git curl
 
-
-RUN apt-get update && \
-  apt-get install -y git make maven openjdk-8-jdk curl && \
-  update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-8-openjdk-amd64/bin/java 100 && \
-  update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac 100 && \
-  update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/bin/java && \
-  update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
-
-
-RUN mkdir /app
 WORKDIR /app
 
 COPY . /app