Conflicts:
	public/app/features/dashboard/dashnav/dashnav.ts

This reverts commit 8f976fd9, reversing
changes made to 072f51e3.

* Bug fix, match tooltip timezone to X-axis timezone

* Small improvement

fix(query editor): Fixed issue with removing query for data sources without collapsable query editors, fixes #4856

Conflicts:
	packaging/publish/publish.sh

allow updates to secureJsonData.

SecureJsonData is stored as a json object in the DB. As the
secureJsonData is never returned to the user they are unable
to provide the full json object when performing updates instead
the user can only provide the specific keys they wish to update.
This commit ensures that only the provided keys are updated and
existing keys in the secureJsonData object are left untouched.