Merge branch 'develop' into develop-internal

Author: ilg-ul

plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF

@@ -571,9 +571,8 @@ Bundle-ClassPath: lib/antlr-runtime-3.5.2.jar,
  lib/jackson-annotations-2.9.9.jar,
  lib/jackson-core-2.9.9.jar,
  lib/jackson-databind-2.9.9.3.jar,
- lib/liqp-0.6.8.jar,
  lib/ST4-4.0.8.jar,
- .,
  lib/json-simple-1.1.1.jar,
- lib/org.jsoup_1.7.2.v201411291515.jar
+ lib/org.jsoup_1.7.2.v201411291515.jar,
+ .
 Automatic-Module-Name: org.eclipse.embedcdt.core