Bug 9907 - Plugins test dies early on some servers

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Merge branch 'bug_9907' into 3.12-master