backporting testsuite fixes to 4.7 branch

[Janis Johnson]

For primarily selfish reasons I'd like to backport several testsuite
fixes from mainline to the 4.7 branch.  Should I request permission for
specific groups of changes, or just do it?

Janis