This commit fixes the regression that the environments
are stopped incorrectly in merge requests.

This fix is still behind the feature flag.