Merge "Simplify and unify the {{REVISIONID}} handling code in Parser"