Merge mozilla-central to b2g-inbound, a=merge, CLOSED TREE

testing/docker/phone-builder/Dockerfile

@@ -8,7 +8,7 @@ ADD           bin                   /home/worker/bin
 ADD           config                /home/worker/.aws/config
 ADD           socorro.token         /home/worker/socorro.token
 
-RUN           yum install -y bc lzop java-1.7.0-openjdk
+RUN           yum install -y bc lzop
 RUN           pip install awscli
 RUN           npm install -g bower gulp apm grunt-cli
 

testing/docker/phone-builder/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.20