Fix cherrypick for PAC equations in case of rule of thumb agents.

The correction for growth neutrality should be substituted in the optimal part
of the PAC equations.

(cherry picked from commit 12694ff9347b2191b4e0f6a32cb038956cb38f53)
(cherry picked from commit 9acac86b)