Merge branch 'v4.6.x' of github.com:grafana/grafana into v4.6.x

package.json

@@ -4,7 +4,7 @@
     "company": "Grafana Labs"
   },
   "name": "grafana",
-  "version": "4.6.0-beta1",
+  "version": "4.6.0-beta2",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git"

public/app/plugins/datasource/cloudwatch/datasource.js

@@ -354,6 +354,7 @@ function (angular, _, moment, dateMath, kbn, templatingVariable) {
         var t = angular.copy(target);
         var scopedVar = {};
         scopedVar[variable.name] = v;
+        t.refId = target.refId + '_' + v.value;
         t.dimensions[dimensionKey] = templateSrv.replace(t.dimensions[dimensionKey], scopedVar);
         return t;
       }).value();