Merged work from trunk

This is done to have a single place where work is done until FileVault has an official release from the Jackrabit project.

Conflicts:
  - target-definition/org.apache.sling.ide.target-definition.target

git-svn-id: https://svn.apache.org/repos/asf/sling/branches/tooling-ide-vlt@1522808 13f79535-47bb-0310-9956-ffa450edef68