Fix travis, jenkins environment issues.

conformance/Makefile.am

@@ -276,6 +276,6 @@ test_python_cpp: protoc_middleman conformance-test-runner
 if OBJC_CONFORMANCE_TEST
 
 test_objc: protoc_middleman conformance-test-runner conformance-objc
-	./conformance-test-runner --enforce_recomemnded --failure_list failure_list_objc.txt ./conformance-objc
+	./conformance-test-runner --enforce_recommended --failure_list failure_list_objc.txt ./conformance-objc
 
 endif

jenkins/docker/Dockerfile

@@ -115,7 +115,7 @@ RUN cd /tmp && \
   cd protobuf && \
   ./autogen.sh && \
   ./configure && \
-  make -j6 && \
+  make -j7 && \
   cd java && \
   $MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO && \
   cd ../javanano && \

ruby/travis-test.sh

@@ -8,7 +8,7 @@ test_version() {
   if [ "$version" == "jruby-1.7" ] ; then
     # No conformance tests yet -- JRuby is too broken to run them.
     bash --login -c \
-      "rvm install $version && rvm use $version && \
+      "rvm install $version && rvm use $version && rvm get head && \
        which ruby && \
        gem install bundler && bundle && \
        rake test"