[FELIX-4433] Provide more control over the substitution

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1570599 13f79535-47bb-0310-9956-ffa450edef68
[FELIX-4434] Require JDK 5

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1570600 13f79535-47bb-0310-9956-ffa450edef68