Merge branch 'revert-49e04f90' into 'master'

Revert "Merge branch 'fix_xuserid_optional_for_GC' into 'master'"

See merge request !569

deployment/default-policies/entitlements.rego

@@ -6,7 +6,7 @@ headers = {
     "Content-Type": "application/json",
     "data-partition-id":input.datapartitionid,
     "Authorization": sprintf("Bearer %v", [input.token]),
-    "x-user-id": object.get(input, "xuserid", null),
+    "x-user-id": input.xuserid,
     "Accept": "application/json"
 }
 

deployment/default-policies/legal.rego

@@ -6,7 +6,7 @@ headers = {
     "content-type": "application/json",
     "data-partition-id":input.datapartitionid,
     "authorization": sprintf("Bearer %v", [input.token]),
-    "x-user-id": object.get(input, "xuserid", null),
+    "x-user-id": input.xuserid,
     "accept": "application/json"
 }