Move the placeholder tag matching into a shared location.

BugID: 4935
Merge branch 'bugid-4935' into dev