Merge "Make sure EJ rewarding quota works." into sc-dev