[FELIX-4342] Substitution is dependent on the order of the map

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