Merge "test_images_oneserver - use the addCleanup mechanism"