Merge pull request #14002 from Nexucis/bugfix/template-srv

[Bugfix] Don't drop the value when it's equal to None

public/app/features/templating/template_srv.ts

@@ -28,7 +28,7 @@ export class TemplateSrv {
     const existsOrEmpty = value => value || value === '';
     const existsOrEmpty = value => value || value === '';
 
 
     this.index = this.variables.reduce((acc, currentValue) => {
     this.index = this.variables.reduce((acc, currentValue) => {
-      if (currentValue.current && !currentValue.current.isNone && existsOrEmpty(currentValue.current.value)) {
+      if (currentValue.current && (currentValue.current.isNone || existsOrEmpty(currentValue.current.value))) {
         acc[currentValue.name] = currentValue;
         acc[currentValue.name] = currentValue;
       }
       }
       return acc;
       return acc;