Task #9939: RA: fix estimator bugs found using estimator regression unit tests (new golden output to be committed next). Supplements prev commit r37294.
