Merge remote-tracking branch 'origin/master' into BETA_JAVA9_PATCH

Conflicts:
	org.eclipse.jdt-feature/feature.xml
	org.eclipse.jdt-feature/pom.xml

=> kept the hard-coded feature version 3.11.0.v20150603-2000 from Mars

org.eclipse.jdt-feature/feature.xml

diff --git a/org.eclipse.jdt-feature/feature.xml b/org.eclipse.jdt-feature/feature.xml
index 42d5d06..e50d8f3 100644
--- a/org.eclipse.jdt-feature/feature.xml
+++ b/org.eclipse.jdt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jdt"
       label="%featureName"
-      version="3.12.0.qualifier"
+      version="3.11.0.v20150603-2000"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

org.eclipse.jdt-feature/pom.xml

diff --git a/org.eclipse.jdt-feature/pom.xml b/org.eclipse.jdt-feature/pom.xml
index fed51c4..2a2244a 100644
--- a/org.eclipse.jdt-feature/pom.xml
+++ b/org.eclipse.jdt-feature/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
   <artifactId>org.eclipse.jdt</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.11.0.v20150603-2000</version>
   <packaging>eclipse-feature</packaging>
 
   <build>