Conflicts:
	public/test/specs/cloudwatch-datasource-specs.js

add graphite multiplySeries function

Missing carriage return in init script when displaying usage

fix(phantomjs binary): fixed PR #2832 so that it works on linux, now phantomjs based server side rendershould work on mac and linux, maybe even windows

fix(dashbard save as): fixed wonky behavior in save as modal, cursor to the end randomly, fixes #2837

fix(singestat): fixed missing sparklines, caused by recent changes to time range handling, fixes #2815

feat(elasticsearch): templating terms query should have size set to zero to return all terms, fixes #2827

Single stat panel throws warning on multiple series result.

fix(singestat): fixed missing sparklines, caused by recent changes to time range handling, fixes #2815