Support for vNext Execution Plans templates

Change-Id: I4fe191d9fb3012e82ee93ad1ffec3cfa8dfc7651