Comment 10 for bug 1251353

Mike, thanks for pointing out the test script and adding the test cases. As noted, this is working well for us, so pushed to master through rel_2_4.

Thanks again for your work on this, Mike!