Merge branch '2.1.x' into 2.2.x

Author: snicoll

ci/scripts/stage.sh

@@ -27,7 +27,7 @@ elif [[ $RELEASE_TYPE = "RC" ]]; then
 	stageVersion=$( get_next_rc_release $snapshotVersion)
 	nextVersion=$snapshotVersion
 elif [[ $RELEASE_TYPE = "RELEASE" ]]; then
-	stageVersion=$( get_next_release $snapshotVersion)
+	stageVersion=$( get_next_release $snapshotVersion "RELEASE" )
 	nextVersion=$( bump_version_number $snapshotVersion)
 else
 	echo "Unknown release type $RELEASE_TYPE" >&2; exit 1;