Diverging from the normal RC process since the additional commits have alrady been made in the master. * rc: preparing for RC bug fix in the test Fixed a bug in the test harness.
