Refs #8374 Added fix for CalibrateRectangularDetector_Test

Russell told me about a test that I'd missed, but as it only runs on Red Hat 6 I wouldn't have seen it.

He supplied a fix which i've added to the appropriate places.
Merge branch 'feature/8374_clean_up_tests' into develop