Merge pull request #4932 from Wikia/VE-1537

VE-1537: Respectively insert block or inline template (instead of always inserting inline)