Fix import of bokeh.models.glyphs in bokeh.plotting_helpers