Merge remote-tracking branch 'grafana/master' into annotations-created

* grafana/master:
  prevent angular from evaluating {{hostname}} in tooltip (#11514)

public/app/plugins/datasource/prometheus/partials/query.editor.html

@@ -14,7 +14,7 @@
         data-min-length=0 data-items=1000 ng-model-onblur ng-change="ctrl.refreshMetricData()">
         data-min-length=0 data-items=1000 ng-model-onblur ng-change="ctrl.refreshMetricData()">
       </input>
       </input>
       <info-popover mode="right-absolute">
       <info-popover mode="right-absolute">
-        Controls the name of the time series, using name or pattern. For example {{hostname}} will be replaced with label value for
+        Controls the name of the time series, using name or pattern. For example <span ng-non-bindable>{{hostname}}</span> will be replaced with label value for
         the label hostname.
         the label hostname.
       </info-popover>
       </info-popover>
     </div>
     </div>