Fixed EZP-20894: (cherry picked from EZP-19707) 

With the relocation of the repository, I am not sure what's the best process to speed up the backporting of this. 
The patch applies smoothly (and produces the desired results) on eZOE 5.5.