Revert "move queryTimeout option to common setting"

This reverts commit 3ba59a1d66a2a3c07ccd04a48c403f0772fbef31.

public/app/features/plugins/partials/ds_http_settings.html

@@ -156,13 +156,4 @@
       </info-popover>
     </div>
   </div>
-  <div class="gf-form-inline">
-    <div class="gf-form">
-      <span class="gf-form-label width-10">Query timeout</span>
-      <input type="text" class="gf-form-input width-9" ng-model="current.jsonData.queryTimeout" spellcheck='false' placeholder="60s"></input>
-      <info-popover mode="right-absolute">
-        Set the Query timeout.
-      </info-popover>
-    </div>
-  </div>
 </div>

public/app/plugins/datasource/prometheus/partials/config.html

@@ -2,15 +2,25 @@
 </datasource-http-settings>
 
 <div class="gf-form-group">
-	<div class="gf-form-inline">
-		<div class="gf-form">
-			<span class="gf-form-label width-8">Scrape interval</span>
-			<input type="text" class="gf-form-input width-8" ng-model="ctrl.current.jsonData.timeInterval" spellcheck='false' placeholder="15s"></input>
-			<info-popover mode="right-absolute">
-                Set this to your global scrape interval defined in your Prometheus config file. This will be used as a lower limit for
-                the Prometheus step query parameter.
-			</info-popover>
-		</div>
+  <div class="gf-form-inline">
+    <div class="gf-form">
+      <span class="gf-form-label width-8">Scrape interval</span>
+      <input type="text" class="gf-form-input width-8" ng-model="ctrl.current.jsonData.timeInterval" spellcheck='false' placeholder="15s"></input>
+      <info-popover mode="right-absolute">
+        Set this to your global scrape interval defined in your Prometheus config file. This will be used as a lower limit for the
+        Prometheus step query parameter.
+      </info-popover>
+    </div>
+  </div>
+
+  <div class="gf-form-inline">
+    <div class="gf-form">
+      <span class="gf-form-label width-8">Query timeout</span>
+      <input type="text" class="gf-form-input width-8" ng-model="ctrl.current.jsonData.queryTimeout" spellcheck='false' placeholder="60s"></input>
+      <info-popover mode="right-absolute">
+        Set the Prometheus query timeout.
+      </info-popover>
+    </div>
   </div>
 
   <div class="gf-form">