VE-1485: Fix template insertion flow
VE-1485: Code review feedback
Merge branch 've-sprint-25' into VE-1485

Conflicts:
	extensions/VisualEditor/wikia/modules/ve/ui/dialogs/ve.ui.WikiaTransclusionDialog.js
Merge pull request #4627 from Wikia/VE-1446

VE-1446 Track template events
Merge branch 've-sprint-25' into VE-1485

Conflicts:
	extensions/VisualEditor/wikia/modules/ve/ui/dialogs/ve.ui.WikiaTransclusionDialog.js
Merge pull request #4626 from Wikia/VE-1485

VE-1485: Fix template insertion flow
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