Remove old style variables used by Velocity I5f4e166ff removed support for Velocity templates so the dash separated variables are no longer needed. Change-Id: I416329a84bf468fe218d488355c7472b4102fd85