Make sure we pass the context key when reloading a resource after changing its template, as well as a fix for the desired action
Ensure context_key is passed when reloading Resource

Merge remote-tracking branch 'origin/pr/793' into release-2.2

* origin/pr/793:
  Make sure we pass the context key when reloading a resource after changing its template, as well as a fix for the desired action