Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/incubator-ambari into trunk

ambari-web/app/views/common/chart/linear_time.js

@@ -353,9 +353,7 @@ App.ChartLinearTimeView = Ember.View.extend({
         this.draw(seriesData);
         this.set('hasData', true);
           //move yAxis value lower to make them fully visible
-          if(!this.get('isPopup')) {
-              $('svg.y_axis text').attr('y',8);
-          }
+        $("#" + this.id + "-container").find('.y_axis text').attr('y',8);
       }
     }
     else {