Fix @var deprecation warnings in drupal templates

Change-Id: I603d54bc6fb002f634c2da77465ad6569c08ce0a
Merge "Fix @var deprecation warnings in drupal templates"