Switch to traditional Code-Review +1/+2 scheme

Signed-off-by: Sandrine Afsa <sandrine.afsa@arm.com>
diff --git a/project.config b/project.config
index 4aaa392..4462a23 100644
--- a/project.config
+++ b/project.config
@@ -35,12 +35,14 @@
 	removeReviewer = group trusted-firmware-a-next
 	abandon = group trusted-firmware-a-next-approvers
 
-	label-Code-Owner-Review = -1..+1 group trusted-firmware-a-next
+	label-Code-Review = -1..+1 group trusted-firmware-a-next
+	label-Code-Review = -2..+2 group trusted-firmware-a-next-approvers
+
 	label-Unsafe-Review = -1..+1 group trusted-firmware-a-next
 	# A CI job will vote Unsafe-Review+1 for patches that do not touch any
 	# unsafe code.
 	label-Unsafe-Review = 0..+1 group Bot Users
-	label-Maintainer-Review = -1..+1 group trusted-firmware-a-next-approvers
+
 	label-Verified = -1..+1 group Bot Users
 	label-Verified = -1..+1 group trusted-firmware-a-next-approvers
 
@@ -62,29 +64,10 @@
 ################################################################################
 # Labels
 ################################################################################
-# The "Code-Review" label exists by default in Gerrit - remove it.
-[label "Code-Review"]
-
-[label "Code-Owner-Review"]
-	value = -1 I would prefer this is not merged as is
-	value = 0 No score
-	value = +1 Looks good to me
-	defaultValue = 0
-	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
-	function = MaxWithBlock
-
 [label "Unsafe-Review"]
-	value = -1 I would prefer this is not merged as is
+	value = -1 Not sound
 	value = 0 No score
-	value = +1 Looks good to me
-	defaultValue = 0
-	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
-	function = MaxWithBlock
-
-[label "Maintainer-Review"]
-	value = -1 I would prefer this is not merged as is
-	value = 0 No score
-	value = +1 Looks good to me
+	value = +1 Sound
 	defaultValue = 0
 	copyCondition = changekind:NO_CHANGE OR changekind:NO_CODE_CHANGE OR changekind:TRIVIAL_REBASE
 	function = MaxWithBlock
@@ -99,5 +82,5 @@
 
 [submit-requirement "Submittable"]
 	applicableIf = -branch:refs/meta/config
-	submittableIf = label:Code-Owner-Review=MAX,user=non_uploader AND -label:Code-Owner-Review=MIN AND label:Maintainer-Review=MAX,user=non_uploader AND -label:Maintainer-Review=MIN AND label:Verified=MAX AND -label:Verified=MIN AND label:Unsafe-Review=MAX AND -label:Unsafe-Review=MIN
+	submittableIf = label:Code-Review=MAX,user=non_uploader AND -label:Code-Review=MIN AND label:Verified=MAX AND -label:Verified=MIN AND label:Unsafe-Review=MAX AND -label:Unsafe-Review=MIN
 	canOverrideInChildProjects = true