Merge branch 've-sprint-25' into VE-1446
VE-1446 Tracking changes
 * Fix tracking of opening advanced dialog
 * Fix tracking of opening template dialog with no parameters
 * Rename tracking labels to be consistent with existing similar labels
Merge branch ve-sprint-25 into VE-1446
Merge pull request #4643 from Wikia/VE-1446

VE-1446 Fixes from testing