[ARIES-1038] Improve placeholders to support multiple compatible placeholders

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