Ship ES6 template literals

src/flag-definitions.h

Index: src/flag-definitions.h
diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index ff68475992a2717f5b7d6b7896595c47ec49aa30..77af030a9533b2e5ce48bcc0a6288aaaf5844bf1 100644
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -183,9 +183,7 @@ DEFINE_IMPLICATION(es_staging, harmony)
   V(harmony_unicode, "harmony unicode escapes")
 
 // Features that are complete (but still behind --harmony/es-staging flag).
-#define HARMONY_STAGED(V)                                                 \
-  V(harmony_tostring, "harmony toString")                                 \
-  V(harmony_templates, "harmony template literals")
+#define HARMONY_STAGED(V) V(harmony_tostring, "harmony toString")
 
 // Features that are shipping (turned on by default, but internal flag remains).
 #define HARMONY_SHIPPING(V)                                               \
@@ -194,7 +192,8 @@ DEFINE_IMPLICATION(es_staging, harmony)
   V(harmony_scoping, "harmony block scoping")                             \
   V(harmony_classes,                                                      \
     "harmony classes (implies block scoping & object literal extension)") \
-  V(harmony_object_literals, "harmony object literal extensions")
+  V(harmony_object_literals, "harmony object literal extensions")         \
+  V(harmony_templates, "harmony template literals")
 
 // Once a shipping feature has proved stable in the wild, it will be dropped
 // from HARMONY_SHIPPING, all occurrences of the FLAG_ variable are removed,