Templating: Fix global variable "__org.id" (#23362)

* Fixed global variable __org.id value

* correct orgId value

* reverted the change as variables moved to new file

public/app/features/variables/state/actions.ts

@@ -97,7 +97,7 @@ export const completeDashboardTemplating = (dashboard: DashboardModel): ThunkRes
     templateSrv.setGlobalVariable('__org', {
       value: {
         name: contextSrv.user.orgName,
-        id: contextSrv.user.id,
+        id: contextSrv.user.orgId,
         toString: function() {
           return this.id;
         },