merge 25790 from trunk.

fix bug in shapesame test where test fails with more than 10
procs. This is a fix in the test itself and does not have to do with
the library code.

tested cloud machine with parallel.