0005165: Image heredity of variant pictures is wrong (cherry picked from commit f972f0ded875dd581aae2398f0ec597c59266da0)

Conflicts:
	tests/unit/core/oxarticleTest.php
0005165: Image heredity of variant pictures is wrong (cherry picked from commit f972f0d)