revert keep-alive (should apply in all cases)

src/compiler/codegen.js

@@ -75,7 +75,7 @@ function genElement (el: ASTElement): string {
       code = transforms[i](el, code)
     }
     // check keep-alive
-    if (el.component && el.keepAlive) {
+    if (el.keepAlive) {
       code = `_h("KeepAlive",{props:{child:${code}}})`
     }
     return code

src/compiler/parser/index.js

@@ -326,9 +326,9 @@ function processComponent (el) {
   let binding
   if ((binding = getBindingAttr(el, 'is'))) {
     el.component = binding
-    if (getAndRemoveAttr(el, 'keep-alive') != null) {
-      el.keepAlive = true
-    }
+  }
+  if (getAndRemoveAttr(el, 'keep-alive') != null) {
+    el.keepAlive = true
   }
   if (getAndRemoveAttr(el, 'inline-template') != null) {
     el.inlineTemplate = true